[Marble-devel] Review Request 111769: switch from qt4_automoc to cmake automoc
Michael Zanetti
mzanetti at kde.org
Sun Jul 28 19:15:27 UTC 2013
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
http://git.reviewboard.kde.org/r/111769/
-----------------------------------------------------------
Review request for Marble.
Description
-------
This commit switches from qt4_automoc to cmake automoc.
This is one more step on the way to make Marble work with Qt5.
Diffs
-----
MarbleMacros.cmake 5a0aedc
examples/cpp/vehicletracking/vehicletracking.cpp 1337cd0
src/CMakeLists.txt b2a3e09
src/ControlView.cpp 46f1b67
src/KdeMainWindow.cpp ba5dae6
src/QtMainWindow.cpp 378cc81
src/StackableWindow.cpp 3a484e0
src/lib/AbstractDataPlugin.cpp 70b24c2
src/lib/AbstractDataPluginItem.cpp 30ce29b
src/lib/AbstractDataPluginModel.cpp 9bf8c17
src/lib/AbstractFloatItem.cpp d465045
src/lib/AbstractWorkerThread.cpp 57f138f
src/lib/AutoNavigation.cpp e7f3152
src/lib/BookmarkManager.cpp ed37681
src/lib/BookmarkManagerDialog.cpp a67b099
src/lib/CMakeLists.txt 16c7fab
src/lib/CacheStoragePolicy.cpp 21a3b2a
src/lib/CurrentLocationWidget.cpp e7da170
src/lib/DataMigration.cpp ad21fa0
src/lib/DeferredFlag.cpp 5a13566
src/lib/DownloadQueueSet.cpp 6d44982
src/lib/DownloadRegion.cpp 78ba6cc
src/lib/DownloadRegionDialog.cpp e1bfd5e
src/lib/EditBookmarkDialog.cpp 78f07e7
src/lib/ElevationModel.cpp 3edef7f
src/lib/ExternalEditorDialog.cpp 47a7c55
src/lib/FileLoader.cpp 3c1d7bf
src/lib/FileManager.cpp 2ff4c6c
src/lib/FileStoragePolicy.cpp 5594954
src/lib/FileStorageWatcher.cpp 8706e71
src/lib/FileViewWidget.cpp cd48730
src/lib/GeoDataTreeModel.cpp c900bf5
src/lib/GeoGraphicsScene.cpp f84c532
src/lib/GeoPolygon.cpp 4d15f00
src/lib/GoToDialog.cpp 003b055
src/lib/HttpDownloadManager.cpp 29eef83
src/lib/HttpJob.cpp 4c38730
src/lib/LatLonBoxWidget.cpp 2cc4f54
src/lib/LatLonEdit.cpp 36cac59
src/lib/LayerManager.cpp 0df19d2
src/lib/LegendWidget.cpp 6239269
src/lib/MapThemeDownloadDialog.cpp a52b272
src/lib/MapThemeManager.cpp 722e93b
src/lib/MapThemeSortFilterProxyModel.cpp 23a9e97
src/lib/MapViewWidget.cpp ebe0041
src/lib/MapWizard.cpp 1e17ebb
src/lib/MarbleAboutDialog.cpp de95fdb
src/lib/MarbleCacheSettingsWidget.cpp 26538e4
src/lib/MarbleClock.cpp 3e22cee
src/lib/MarbleControlBox.cpp 0a17634
src/lib/MarbleLegendBrowser.cpp 65915e8
src/lib/MarbleLineEdit.cpp 79d9af0
src/lib/MarbleMap.cpp 8839ad3
src/lib/MarbleModel.cpp 96d1b0b
src/lib/MarbleNavigator.cpp cc80fd3
src/lib/MarblePhysics.cpp 9c4b112
src/lib/MarblePlacemarkModel.cpp 19b0a7e
src/lib/MarblePluginSettingsWidget.cpp 03a4c34
src/lib/MarbleRunnerManager.cpp bd23d00
src/lib/MarbleWebView.cpp 19622b2
src/lib/MarbleWidget.cpp 026d996
src/lib/MarbleWidgetInputHandler.cpp 5d9628f
src/lib/MarbleWidgetPopupMenu.cpp 7dd48cb
src/lib/NavigationWidget.cpp b4285e9
src/lib/NewBookmarkFolderDialog.cpp cfcda4d
src/lib/NewstuffModel.cpp a3b2bf2
src/lib/ParseRunnerPlugin.cpp 97d5f65
src/lib/ParsingRunner.cpp 81458ce
src/lib/PlacemarkLayout.cpp 491aeb6
src/lib/PluginAboutDialog.cpp 8649f4b
src/lib/PluginItemDelegate.cpp 31cb8ab
src/lib/PluginManager.cpp e46d8b9
src/lib/PopupItem.cpp c07e083
src/lib/PositionProviderPlugin.cpp 9e543bd
src/lib/PositionTracking.cpp 0141668
src/lib/PrintOptionsWidget.cpp 8273459
src/lib/QtMarbleConfigDialog.cpp 79f05cf
src/lib/RenderPlugin.cpp a51b27f
src/lib/RenderPluginModel.cpp e3cfee7
src/lib/ReverseGeocodingRunner.cpp fb15272
src/lib/ReverseGeocodingRunnerPlugin.cpp faaa15b
src/lib/RoutingRunner.cpp 7f929b8
src/lib/RoutingRunnerPlugin.cpp 43316af
src/lib/RunnerTask.cpp 18b2434
src/lib/SearchInputWidget.cpp c2e9426
src/lib/SearchRunner.cpp a181947
src/lib/SearchRunnerPlugin.cpp 1af58a4
src/lib/SearchWidget.cpp c77a38d
src/lib/StackedTileLoader.cpp fc5ec9c
src/lib/StoragePolicy.cpp f89d0f9
src/lib/SunControlWidget.cpp b16cd9d
src/lib/SunLocator.cpp 4b4d35f
src/lib/TileCreator.cpp 920a47c
src/lib/TileCreatorDialog.cpp eb09b02
src/lib/TileLevelRangeWidget.cpp 4d4b43f
src/lib/TileLoader.cpp 0f54b75
src/lib/TileScalingTextureMapper.cpp 22c8f1e
src/lib/TimeControlWidget.cpp abdd3a3
src/lib/TinyWebBrowser.cpp 65ff295
src/lib/VectorComposer.cpp f4ac0c7
src/lib/VectorTileModel.cpp cb14ed5
src/lib/WikipediaService.cpp e791647
src/lib/geodata/scene/GeoSceneDocument.cpp 6c36b0a
src/lib/geodata/scene/GeoSceneGroup.cpp c5ff11d
src/lib/geodata/scene/GeoSceneProperty.cpp fa44955
src/lib/geodata/scene/GeoSceneSettings.cpp 3d22738
src/lib/kdescendantsproxymodel.cpp 4e04b44
src/lib/kineticmodel.cpp b246781
src/lib/layers/GeometryLayer.cpp 1bba353
src/lib/layers/PlacemarkLayer.cpp 863fd94
src/lib/layers/PopupLayer.cpp 0388add
src/lib/layers/TextureLayer.cpp 8679fdf
src/lib/layers/VectorTileLayer.cpp 0f63ca4
src/lib/routing/AlternativeRoutesModel.cpp 72b9c75
src/lib/routing/RouteRequest.cpp 7de7193
src/lib/routing/RoutingInputWidget.cpp ed3d523
src/lib/routing/RoutingLayer.cpp 50e9509
src/lib/routing/RoutingManager.cpp d78f714
src/lib/routing/RoutingModel.cpp b80f437
src/lib/routing/RoutingProfileSettingsDialog.cpp e07de11
src/lib/routing/RoutingProfilesModel.cpp 0780bd4
src/lib/routing/RoutingProfilesWidget.cpp 3f755d9
src/lib/routing/RoutingWidget.cpp afe1cdd
src/lib/routing/SpeakersModel.cpp 167c830
src/lib/routing/VoiceNavigationModel.cpp 1bc2e1b
src/marble_part.cpp 03ca011
src/plasmoid/worldclock.cpp da81d51
src/plugins/declarative/Bookmarks.cpp 0e2951f
src/plugins/declarative/CMakeLists.txt 77be685
src/plugins/declarative/Coordinate.cpp 71b04f8
src/plugins/declarative/DeclarativeDataPlugin.cpp 1dd7dfe
src/plugins/declarative/DeclarativeDataPluginItem.cpp 8f2cab5
src/plugins/declarative/DeclarativeDataPluginModel.cpp d2dfcc4
src/plugins/declarative/DeclarativeMapThemeManager.cpp 8e3506c
src/plugins/declarative/MapThemeModel.cpp 221976d
src/plugins/declarative/MarbleDeclarativeObject.cpp e9a5e2f
src/plugins/declarative/MarbleDeclarativePlugin.cpp 1adbb0f
src/plugins/declarative/MarbleDeclarativeWidget.cpp bf2393e
src/plugins/declarative/Navigation.cpp 8c4a6db
src/plugins/declarative/OfflineDataModel.cpp ca809c7
src/plugins/declarative/Placemark.cpp 863cec9
src/plugins/declarative/PositionSource.cpp 9bc5bab
src/plugins/declarative/RelatedActivities.cpp c2a547a
src/plugins/declarative/RouteRequestModel.cpp e784c6b
src/plugins/declarative/Routing.cpp 5848135
src/plugins/declarative/Search.cpp 9d8af9d
src/plugins/declarative/Settings.cpp 9d18ac4
src/plugins/declarative/Tracking.cpp d29a1d2
src/plugins/declarative/ZoomButtonInterceptor.cpp cfa0129
src/plugins/designer/latloneditwidget/LatLonEditPlugin.cpp 9ce8c11
src/plugins/designer/marblewidget/MarbleWidgetPlugin.cpp de112c4
src/plugins/designer/navigator/MarbleNavigatorPlugin.cpp 71c7c57
src/plugins/positionprovider/flightgear/FlightGearPositionProviderPlugin.cpp 6ab49af
src/plugins/positionprovider/geoclue/GeoCluePositionProviderPlugin.cpp 1a20e02
src/plugins/positionprovider/geoclue/GeoCute/CMakeLists.txt abde4f2
src/plugins/positionprovider/geoclue/GeoCute/MasterClient.cpp 1255b81
src/plugins/positionprovider/geoclue/GeoCute/PositionProvider.cpp d5f9a90
src/plugins/positionprovider/geoclue/GeoCute/Provider.cpp 21969d8
src/plugins/positionprovider/geoclue/GeoCute/SimpleDBusInterface.cpp fdf6de4
src/plugins/positionprovider/geoclue/GeoCute/VelocityProvider.cpp 7989f78
src/plugins/positionprovider/gpsd/GpsdConnection.cpp b021e7f
src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp 0ce3196
src/plugins/positionprovider/gpsd/GpsdThread.cpp c19357f
src/plugins/positionprovider/maemo/MaemoPositionProviderPlugin.cpp 8af3f5d
src/plugins/positionprovider/placemark/PlacemarkPositionProviderPlugin.cpp 3880848
src/plugins/positionprovider/qtmobility/QtMobilityPositionProviderPlugin.cpp ea2bfdc
src/plugins/positionprovider/routesimulation/RouteSimulationPositionProviderPlugin.cpp 9c8cd11
src/plugins/positionprovider/wlocate/WlocatePositionProviderPlugin.cpp b202e21
src/plugins/qt-components/CMakeLists.txt e2db1bf
src/plugins/qt-components/QtComponentsPlugin.cpp 1b3f9c9
src/plugins/render/annotate/AnnotatePlugin.cpp c6ff1bb
src/plugins/render/annotate/TextEditor.cpp 10d2ac6
src/plugins/render/aprs/AprsGatherer.cpp 8c0bc92
src/plugins/render/aprs/AprsPlugin.cpp 2485a30
src/plugins/render/aprs/CMakeLists.txt 4896a8e
src/plugins/render/atmosphere/AtmospherePlugin.cpp 492c111
src/plugins/render/compass/CompassFloatItem.cpp a0a0cac
src/plugins/render/crosshairs/CrosshairsPlugin.cpp 769b60b
src/plugins/render/earthquake/CMakeLists.txt 6a4704e
src/plugins/render/earthquake/EarthquakeItem.cpp 5f2f0bd
src/plugins/render/earthquake/EarthquakeModel.cpp ea69955
src/plugins/render/earthquake/EarthquakePlugin.cpp 0b29252
src/plugins/render/elevationprofilefloatitem/CMakeLists.txt 872e5e1
src/plugins/render/elevationprofilefloatitem/ElevationProfileFloatItem.cpp c2208f7
src/plugins/render/elevationprofilefloatitem/ElevationProfilePlotAxis.cpp e9d530a
src/plugins/render/elevationprofilemarker/CMakeLists.txt bbe043e
src/plugins/render/elevationprofilemarker/ElevationProfileMarker.cpp 4334a69
src/plugins/render/fileview/CMakeLists.txt adfa961
src/plugins/render/fileview/FileViewFloatItem.cpp ae6e1ba
src/plugins/render/foursquare/CMakeLists.txt 0b62efd
src/plugins/render/foursquare/FoursquareItem.cpp dee04db
src/plugins/render/foursquare/FoursquareModel.cpp a0a440b
src/plugins/render/foursquare/FoursquarePlugin.cpp dbc4928
src/plugins/render/gpsinfo/GpsInfo.cpp fd00037
src/plugins/render/graticule/GraticulePlugin.cpp 7f5b2a7
src/plugins/render/inhibit-screensaver/InhibitScreensaverPlugin.cpp 70b1656
src/plugins/render/license/CMakeLists.txt 90c0097
src/plugins/render/license/License.cpp 3de8e54
src/plugins/render/mapscale/MapScaleFloatItem.cpp 1e469bb
src/plugins/render/measure/MeasureToolPlugin.cpp 26a4174
src/plugins/render/navigation/ArrowDiscWidget.cpp 4db534f
src/plugins/render/navigation/CMakeLists.txt b0597aa
src/plugins/render/navigation/NavigationButton.cpp 5079c83
src/plugins/render/navigation/NavigationFloatItem.cpp 1ca9e15
src/plugins/render/navigation/NavigationSlider.cpp 9457d7a
src/plugins/render/opencaching/CMakeLists.txt 947e5f5
src/plugins/render/opencaching/OpenCachingItem.cpp 8991cd1
src/plugins/render/opencaching/OpenCachingModel.cpp f382809
src/plugins/render/opencaching/OpenCachingPlugin.cpp dfe6bf0
src/plugins/render/opencachingcom/CMakeLists.txt 09176d8
src/plugins/render/opencachingcom/OpenCachingComItem.cpp c8cae68
src/plugins/render/opencachingcom/OpenCachingComModel.cpp 067ffde
src/plugins/render/opencachingcom/OpenCachingComPlugin.cpp 576198f
src/plugins/render/opendesktop/CMakeLists.txt 50da329
src/plugins/render/opendesktop/OpenDesktopItem.cpp e4214b5
src/plugins/render/opendesktop/OpenDesktopModel.cpp d80be3d
src/plugins/render/opendesktop/OpenDesktopPlugin.cpp f54fd14
src/plugins/render/overviewmap/OverviewMap.cpp a88e568
src/plugins/render/panoramio/PanoramioModel.cpp 081951f
src/plugins/render/panoramio/PanoramioPlugin.cpp d883f70
src/plugins/render/photo/PhotoPlugin.cpp acc7191
src/plugins/render/photo/PhotoPluginItem.cpp d5e41b2
src/plugins/render/photo/PhotoPluginModel.cpp 744bc35
src/plugins/render/positionmarker/PositionMarker.cpp 3582e4b
src/plugins/render/postalcode/PostalCodeItem.cpp 677c98f
src/plugins/render/postalcode/PostalCodeModel.cpp 49acb18
src/plugins/render/postalcode/PostalCodePlugin.cpp 87feacd
src/plugins/render/progress/ProgressFloatItem.cpp 96f98ef
src/plugins/render/routing/AudioOutput.cpp c254c33
src/plugins/render/routing/NullAudioOutput.cpp a8128a3
src/plugins/render/routing/RoutingPlugin.cpp 1dc1918
src/plugins/render/satellites/SatellitesConfigDialog.cpp 6939759
src/plugins/render/satellites/SatellitesConfigModel.cpp 92da19f
src/plugins/render/satellites/SatellitesMSCItem.cpp 27b75a8
src/plugins/render/satellites/SatellitesModel.cpp 5d73653
src/plugins/render/satellites/SatellitesPlugin.cpp 2ef3d51
src/plugins/render/satellites/SatellitesTLEItem.cpp 45628ac
src/plugins/render/satellites/TrackerPluginItem.cpp 27a9a9e
src/plugins/render/satellites/TrackerPluginModel.cpp 1d37bdb
src/plugins/render/speedometer/Speedometer.cpp d1e2bef
src/plugins/render/stars/StarsPlugin.cpp f1afdc4
src/plugins/render/sun/SunPlugin.cpp b03fac2
src/plugins/render/test/TestPlugin.cpp 5063c18
src/plugins/render/twitter/twitterPlugin.cpp cebe081
src/plugins/render/weather/AbstractWeatherService.cpp 0b30c37
src/plugins/render/weather/BBCItemGetter.cpp 22b797c
src/plugins/render/weather/BBCParser.cpp 66a0957
src/plugins/render/weather/BBCWeatherItem.cpp f1c640a
src/plugins/render/weather/BBCWeatherService.cpp 97c34b3
src/plugins/render/weather/FakeWeatherService.cpp ad8d1c4
src/plugins/render/weather/GeoNamesWeatherItem.cpp cb17699
src/plugins/render/weather/GeoNamesWeatherService.cpp ecbe56d
src/plugins/render/weather/StationListParser.cpp a79fb2a
src/plugins/render/weather/WeatherItem.cpp 0631efa
src/plugins/render/weather/WeatherModel.cpp ac54569
src/plugins/render/weather/WeatherPlugin.cpp bcaeeb2
src/plugins/render/wikipedia/WikipediaItem.cpp ea96dce
src/plugins/render/wikipedia/WikipediaModel.cpp c816980
src/plugins/render/wikipedia/WikipediaPlugin.cpp ea8bc53
src/plugins/runner/cache/CachePlugin.cpp bc4406f
src/plugins/runner/cache/CacheRunner.cpp ffcacba
src/plugins/runner/gosmore-reversegeocoding/GosmoreReverseGeocodingPlugin.cpp f524d25
src/plugins/runner/gosmore-routing/GosmoreRoutingPlugin.cpp 5107660
src/plugins/runner/gpx/CMakeLists.txt 74afed1
src/plugins/runner/gpx/GpxPlugin.cpp 3fede93
src/plugins/runner/gpx/GpxRunner.cpp de1d706
src/plugins/runner/gpx/tests/TestTrack.cpp c579217
src/plugins/runner/hostip/HostipPlugin.cpp 17c9fc6
src/plugins/runner/hostip/HostipRunner.cpp 6c40d8b
src/plugins/runner/json/JsonPlugin.cpp e7ff770
src/plugins/runner/json/JsonRunner.cpp e3ea7f2
src/plugins/runner/kml/KmlPlugin.cpp e338fe7
src/plugins/runner/kml/KmlRunner.cpp 9769a52
src/plugins/runner/latlon/LatLonPlugin.cpp 33d272c
src/plugins/runner/latlon/LatLonRunner.cpp ef08b61
src/plugins/runner/local-osm-search/LocalOsmSearchPlugin.cpp c82d441
src/plugins/runner/local-osm-search/LocalOsmSearchRunner.cpp 7f466f8
src/plugins/runner/localdatabase/LocalDatabasePlugin.cpp 7aeba9e
src/plugins/runner/localdatabase/LocalDatabaseRunner.cpp ff5ff61
src/plugins/runner/log/LogPlugin.cpp 286ccc6
src/plugins/runner/log/LogRunner.cpp 436537e
src/plugins/runner/mapquest/MapQuestPlugin.cpp 5624c20
src/plugins/runner/mapquest/MapQuestRunner.cpp efcbd90
src/plugins/runner/monav/MonavConfigWidget.cpp 9a220d8
src/plugins/runner/monav/MonavMapsModel.cpp 9af5f40
src/plugins/runner/monav/MonavPlugin.cpp 6515523
src/plugins/runner/monav/MonavRunner.cpp 8db2eb4
src/plugins/runner/nominatim-reversegeocoding/NominatimReverseGeocodingPlugin.cpp 34a98a4
src/plugins/runner/nominatim-reversegeocoding/OsmNominatimReverseGeocodingRunner.cpp 708fee2
src/plugins/runner/nominatim-search/NominatimSearchPlugin.cpp 771c61f
src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.cpp af0c913
src/plugins/runner/open-source-routing-machine/OSRMPlugin.cpp ab215d5
src/plugins/runner/open-source-routing-machine/OSRMRunner.cpp a29536f
src/plugins/runner/openrouteservice/OpenRouteServicePlugin.cpp 8dc64e5
src/plugins/runner/openrouteservice/OpenRouteServiceRunner.cpp 56af1dc
src/plugins/runner/osm/OsmPlugin.cpp aa6be5c
src/plugins/runner/osm/OsmRunner.cpp 22b1e9b
src/plugins/runner/pn2/Pn2Plugin.cpp debec35
src/plugins/runner/pn2/Pn2Runner.cpp 877abe1
src/plugins/runner/pnt/PntPlugin.cpp 0f5eb7b
src/plugins/runner/pnt/PntRunner.cpp bc3a068
src/plugins/runner/routino/RoutinoPlugin.cpp 7b4fd3b
src/plugins/runner/routino/RoutinoRunner.cpp 4186349
src/plugins/runner/shp/ShpPlugin.cpp d7c094e
src/plugins/runner/shp/ShpRunner.cpp 6081cdc
src/plugins/runner/traveling-salesman/TravelingSalesmanPlugin.cpp 630ae9c
src/plugins/runner/yours/YoursPlugin.cpp 0ee0a46
src/plugins/runner/yours/YoursRunner.cpp 72f7e8d
src/plugins/templates/floatitem/FITemplateFloatItem.cpp 6fba884
src/qt-components/marble-touch/CMakeLists.txt 52940a6
src/routing-instructions/CMakeLists.txt c1e6386
src/tilecreator/CMakeLists.txt f1eed44
tools/tilecreator-srtm2/CMakeLists.txt 8088187
Diff: http://git.reviewboard.kde.org/r/111769/diff/
Testing
-------
Tested on Ubuntu with Qt4 and -DQTONLY=1
Thanks,
Michael Zanetti
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/marble-devel/attachments/20130728/e4655948/attachment-0001.html>
More information about the Marble-devel
mailing list