[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdeedu/marble/src
From: Frank Osterfeld <frank.osterfeld () kdemail ! net>
Date: 2007-06-04 16:35:22
Message-ID: 1180974922.298753.7357.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 671385 by osterfeld:
fix build on OSX
These #ifndef Q_OS_MACX around the #include .moc are not needed and it builds without \
them (and didn't before) Tested both with KDE support and QTONLY
CCMAIL:tackat@kde.org
M +0 -2 KdeMainWindow.cpp
M +0 -2 MarbleControlBox.cpp
M +0 -2 QtMainWindow.cpp
M +0 -2 katlascontrol.cpp
M +0 -3 lib/HttpDownloadManager.cpp
M +0 -2 lib/MarbleModel.cpp
M +0 -2 lib/MarbleWidget.cpp
M +0 -2 lib/TextureTile.cpp
M +0 -2 lib/TileLoader.cpp
M +0 -3 lib/httpfetchfile.cpp
M +2 -0 lib/katlasaboutdialog.cpp
M +0 -2 lib/katlascrosshair.cpp
M +0 -2 lib/katlasflag.cpp
M +0 -2 lib/katlasmapscale.cpp
M +0 -2 lib/katlasthemeselectview.cpp
M +0 -2 lib/katlastilecreatordialog.cpp
M +3 -3 lib/katlasviewinputhandler.cpp
M +2 -7 lib/katlasviewpopupmenu.cpp
M +0 -2 lib/katlaswindrose.cpp
M +0 -2 lib/maptheme.cpp
M +0 -2 lib/measuretool.cpp
M +0 -3 lib/placemarkinfodialog.cpp
M +0 -2 lib/placemarkmodel.cpp
M +0 -2 lib/placemarkpainter.cpp
M +0 -2 lib/searchcombobox.cpp
M +0 -2 lib/searchlistview.cpp
M +0 -2 lib/tilescissor.cpp
M +0 -2 lib/tinywebbrowser.cpp
M +0 -2 plugins/marblewidget/MarbleWidgetPlugin.cpp
M +0 -2 plugins/navigator/MarbleNavigator.cpp
M +0 -2 plugins/navigator/MarbleNavigatorPlugin.cpp
--- trunk/KDE/kdeedu/marble/src/KdeMainWindow.cpp #671384:671385
@@ -154,6 +154,4 @@
}
-#ifndef Q_OS_MACX
#include "KdeMainWindow.moc"
-#endif
--- trunk/KDE/kdeedu/marble/src/MarbleControlBox.cpp #671384:671385
@@ -159,6 +159,4 @@
}
-#ifndef Q_OS_MACX
#include "MarbleControlBox.moc"
-#endif
--- trunk/KDE/kdeedu/marble/src/QtMainWindow.cpp #671384:671385
@@ -168,6 +168,4 @@
// dlg.exec();
}
-#ifndef Q_OS_MACX
#include "QtMainWindow.moc"
-#endif
--- trunk/KDE/kdeedu/marble/src/katlascontrol.cpp #671384:671385
@@ -84,6 +84,4 @@
}
-#ifndef Q_OS_MACX
#include "katlascontrol.moc"
-#endif
--- trunk/KDE/kdeedu/marble/src/lib/HttpDownloadManager.cpp #671384:671385
@@ -74,7 +74,4 @@
}
}
-
-#ifndef Q_OS_MACX
#include "HttpDownloadManager.moc"
-#endif
--- trunk/KDE/kdeedu/marble/src/lib/MarbleModel.cpp #671384:671385
@@ -357,6 +357,4 @@
return m_placemarkpainter->whichPlaceMarkAt( curpos );
}
-#ifndef Q_OS_MACX
#include "MarbleModel.moc"
-#endif
--- trunk/KDE/kdeedu/marble/src/lib/MarbleWidget.cpp #671384:671385
@@ -407,6 +407,4 @@
return zoom;
}
-#ifndef Q_OS_MACX
#include "MarbleWidget.moc"
-#endif
--- trunk/KDE/kdeedu/marble/src/lib/TextureTile.cpp #671384:671385
@@ -177,6 +177,4 @@
}
-#ifndef Q_OS_MACX
#include "TextureTile.moc"
-#endif
--- trunk/KDE/kdeedu/marble/src/lib/TileLoader.cpp #671384:671385
@@ -233,6 +233,4 @@
}
-#ifndef Q_OS_MACX
#include "TileLoader.moc"
-#endif
--- trunk/KDE/kdeedu/marble/src/lib/httpfetchfile.cpp #671384:671385
@@ -125,7 +125,4 @@
}
}
-
-#ifndef Q_OS_MACX
#include "httpfetchfile.moc"
-#endif
--- trunk/KDE/kdeedu/marble/src/lib/katlasaboutdialog.cpp #671384:671385
@@ -49,3 +49,5 @@
}
}
+#include "katlasaboutdialog.moc"
+
--- trunk/KDE/kdeedu/marble/src/lib/katlascrosshair.cpp #671384:671385
@@ -38,6 +38,4 @@
}
-#ifndef Q_OS_MACX
#include "katlascrosshair.moc"
-#endif
--- trunk/KDE/kdeedu/marble/src/lib/katlasflag.cpp #671384:671385
@@ -59,6 +59,4 @@
}
-#ifndef Q_OS_MACX
#include "katlasflag.moc"
-#endif
--- trunk/KDE/kdeedu/marble/src/lib/katlasmapscale.cpp #671384:671385
@@ -170,6 +170,4 @@
}
-#ifndef Q_OS_MACX
#include "katlasmapscale.moc"
-#endif
--- trunk/KDE/kdeedu/marble/src/lib/katlasthemeselectview.cpp #671384:671385
@@ -61,6 +61,4 @@
}
-#ifndef Q_OS_MACX
#include "katlasthemeselectview.moc"
-#endif
--- trunk/KDE/kdeedu/marble/src/lib/katlastilecreatordialog.cpp #671384:671385
@@ -39,6 +39,4 @@
}
-#ifndef Q_OS_MACX
#include "katlastilecreatordialog.moc"
-#endif
--- trunk/KDE/kdeedu/marble/src/lib/katlasviewinputhandler.cpp #671384:671385
@@ -13,9 +13,6 @@
#include <QtCore/QDebug>
-#ifndef Q_OS_MACX
-#include "katlasviewinputhandler.moc"
-#endif
#include "GeoPoint.h"
#include "Quaternion.h"
@@ -272,3 +269,6 @@
return false;
}
}
+
+#include "katlasviewinputhandler.moc"
+
--- trunk/KDE/kdeedu/marble/src/lib/katlasviewpopupmenu.cpp #671384:671385
@@ -14,10 +14,6 @@
#include <QtCore/QDebug>
#include <QtGui/QMenu>
-#ifndef Q_OS_MACX
-#include "katlasviewpopupmenu.moc"
-#endif
-
#include "katlasaboutdialog.h"
#include "MarbleWidget.h"
#include "MarbleModel.h"
@@ -147,6 +143,5 @@
}
-#ifndef Q_OS_MACX
-#include "katlasaboutdialog.moc"
-#endif
+#include "katlasviewpopupmenu.moc"
+
--- trunk/KDE/kdeedu/marble/src/lib/katlaswindrose.cpp #671384:671385
@@ -104,6 +104,4 @@
}
-#ifndef Q_OS_MACX
#include "katlaswindrose.moc"
-#endif
--- trunk/KDE/kdeedu/marble/src/lib/maptheme.cpp #671384:671385
@@ -287,6 +287,4 @@
}
-#ifndef Q_OS_MACX
#include "maptheme.moc"
-#endif
--- trunk/KDE/kdeedu/marble/src/lib/measuretool.cpp #671384:671385
@@ -247,6 +247,4 @@
}
-#ifndef Q_OS_MACX
#include "measuretool.moc"
-#endif
--- trunk/KDE/kdeedu/marble/src/lib/placemarkinfodialog.cpp #671384:671385
@@ -137,7 +137,4 @@
flag_val_lbl->setPixmap( m_flagcreator->flag() );
}
-
-#ifndef Q_OS_MACX
#include "placemarkinfodialog.moc"
-#endif
--- trunk/KDE/kdeedu/marble/src/lib/placemarkmodel.cpp #671384:671385
@@ -326,6 +326,4 @@
}
-#ifndef Q_OS_MACX
#include "placemarkmodel.moc"
-#endif
--- trunk/KDE/kdeedu/marble/src/lib/placemarkpainter.cpp #671384:671385
@@ -404,6 +404,4 @@
}
-#ifndef Q_OS_MACX
#include "placemarkpainter.moc"
-#endif
--- trunk/KDE/kdeedu/marble/src/lib/searchcombobox.cpp #671384:671385
@@ -43,6 +43,4 @@
}
-#ifndef Q_OS_MACX
#include "searchcombobox.moc"
-#endif
--- trunk/KDE/kdeedu/marble/src/lib/searchlistview.cpp #671384:671385
@@ -48,6 +48,4 @@
}
-#ifndef Q_OS_MACX
#include "searchlistview.moc"
-#endif
--- trunk/KDE/kdeedu/marble/src/lib/tilescissor.cpp #671384:671385
@@ -305,6 +305,4 @@
}
-#ifndef Q_OS_MACX
#include "tilescissor.moc"
-#endif
--- trunk/KDE/kdeedu/marble/src/lib/tinywebbrowser.cpp #671384:671385
@@ -89,6 +89,4 @@
}
-#ifndef Q_OS_MACX
#include "tinywebbrowser.moc"
-#endif
--- trunk/KDE/kdeedu/marble/src/plugins/marblewidget/MarbleWidgetPlugin.cpp \
#671384:671385 @@ -101,6 +101,4 @@
Q_EXPORT_PLUGIN2(MarbleWidgetPlugin, MarbleWidgetPlugin)
-#ifndef Q_OS_MACX
#include "MarbleWidgetPlugin.moc"
-#endif
--- trunk/KDE/kdeedu/marble/src/plugins/navigator/MarbleNavigator.cpp #671384:671385
@@ -77,6 +77,4 @@
}
-#ifndef Q_OS_MACX
#include "MarbleNavigator.moc"
-#endif
--- trunk/KDE/kdeedu/marble/src/plugins/navigator/MarbleNavigatorPlugin.cpp \
#671384:671385 @@ -99,6 +99,4 @@
Q_EXPORT_PLUGIN2(MarbleNavigatorPlugin, MarbleNavigatorPlugin)
-#ifndef Q_OS_MACX
#include "MarbleNavigatorPlugin.moc"
-#endif
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic