[Marble-devel] Review Request 111698: remove Qt modules from includes and adjust CMakeLists.txt to add missing modules

Dennis Nienhüser earthwings at gentoo.org
Sat Jul 27 14:14:52 UTC 2013


-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
http://git.reviewboard.kde.org/r/111698/#review36599
-----------------------------------------------------------

Ship it!


Looks good. A little change is needed though (see adjusted patch below) to have the KDE version compile as well: Similar to the QtOnly version it doesn't have all dependencies specified correctly yet.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bad9e74..04549e5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -251,12 +251,15 @@ endif(APPLE)
 ####################################################
 # Specific options for if building with Qt or kde4 libs
 
-if(QTONLY)
   find_package(Qt4 REQUIRED)
-  set( QT_USE_QTXML      ON )
-  set( QT_USE_QTNETWORK  ON )
-  set( QT_USE_QTTEST     ON )
-  set( QT_USE_QTSCRIPT   ON )
+  set( QT_USE_QTXML         ON )
+  set( QT_USE_QTNETWORK     ON )
+  set( QT_USE_QTTEST        ON )
+  set( QT_USE_QTSCRIPT      ON )
+  set( QT_USE_QTWEBKIT      ON )
+  set( QT_USE_QTSVG         ON )
+  set( QT_USE_QTDECLARATIVE ON )
+  set( QT_USE_QTSQL         ON )
   include( ${QT_USE_FILE} )
   marble_set_package_properties( Qt4 PROPERTIES DESCRIPTION "cross-platform application framework" )
   marble_set_package_properties( Qt4 PROPERTIES URL "http://qt.digia.com/" )
@@ -267,6 +270,7 @@ if(QTONLY)
     FIND_LIBRARY(QT_QTDECLARATIVE_LIBRARY NAMES QtDeclarative HINTS ${QT_LIBRARY_DIR})
   ENDIF()
 
+if(QTONLY)
   # add a flag to be able to distinguish between qt 
   # and kde mode in the sources
   add_definitions(-DQTONLY)

- Dennis Nienhüser


On July 25, 2013, 8:21 p.m., Michael Zanetti wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> http://git.reviewboard.kde.org/r/111698/
> -----------------------------------------------------------
> 
> (Updated July 25, 2013, 8:21 p.m.)
> 
> 
> Review request for Marble.
> 
> 
> Description
> -------
> 
> Removes all the Qt modules from the include directives and adds the missing Qt modules to the CMakeLists.txt
> 
> 
> Diffs
> -----
> 
>   CMakeLists.txt bad9e74 
>   examples/cpp/animation-video/main.cpp 22f9cda 
>   examples/cpp/basic-routing/main.cpp 951b820 
>   examples/cpp/custom-layers/main.cpp 1f2fe34 
>   examples/cpp/geopainter/main.cpp 61a9d30 
>   examples/cpp/hello-marble/main.cpp 74da815 
>   examples/cpp/kml-inspector/main.cpp ae659b3 
>   examples/cpp/map-controls/main.cpp 349505f 
>   examples/cpp/map-properties/main.cpp 1bdf65d 
>   examples/cpp/reverse-geocoding/main.cpp 0648e91 
>   examples/cpp/search/main.cpp b7790fb 
>   examples/cpp/vehicletracking/vehicletracking.cpp 29a606f 
>   src/ControlView.cpp 795c83e 
>   src/KdeMainWindow.cpp 1e4b07a 
>   src/MarbleTest.cpp 6e14c91 
>   src/QtMainWindow.cpp cda67ce 
>   src/kdemain.cpp 10dfd04 
>   src/lib/AbstractDataPlugin.cpp 347f4b1 
>   src/lib/AbstractDataPluginItem.cpp 13bdf59 
>   src/lib/AbstractDataPluginModel.cpp f496bb5 
>   src/lib/AbstractFloatItem.cpp 596c4b4 
>   src/lib/AbstractWorkerThread.cpp bbac47c 
>   src/lib/AutoNavigation.cpp f892d56 
>   src/lib/BookmarkManager.cpp 4fd4e8b 
>   src/lib/BookmarkManagerDialog.cpp 74d32b3 
>   src/lib/CacheStoragePolicy.cpp f9055ca 
>   src/lib/CurrentLocationWidget.cpp 0abeed2 
>   src/lib/DataMigration.cpp 1c7eb0c 
>   src/lib/DeferredFlag.cpp 3b92752 
>   src/lib/DiscCache.cpp 2fcd9d5 
>   src/lib/DownloadRegionDialog.cpp 598f1d1 
>   src/lib/EditBookmarkDialog.cpp bfc7cdf 
>   src/lib/ElevationModel.cpp 561cea1 
>   src/lib/EquirectScanlineTextureMapper.cpp 1a0a3a6 
>   src/lib/ExternalEditorDialog.cpp 86d0f26 
>   src/lib/FileLoader.cpp 872f351 
>   src/lib/FileManager.cpp aae3c81 
>   src/lib/FileStoragePolicy.cpp ca22b11 
>   src/lib/FileStorageWatcher.cpp 7e97d10 
>   src/lib/FileViewWidget.cpp bbbc853 
>   src/lib/GeoDataTreeModel.cpp 4cc73dd 
>   src/lib/GeoGraphicsScene.cpp 9e39568 
>   src/lib/GeoPainter.cpp 4435e84 
>   src/lib/GeoPolygon.cpp ba9da66 
>   src/lib/GoToDialog.cpp 57b65de 
>   src/lib/HttpDownloadManager.cpp 327bcf3 
>   src/lib/HttpJob.cpp 36f2150 
>   src/lib/LatLonEdit.cpp b568298 
>   src/lib/MapThemeDownloadDialog.cpp 50e9243 
>   src/lib/MapThemeManager.cpp 7812ad0 
>   src/lib/MapThemeSortFilterProxyModel.cpp 436a5cf 
>   src/lib/MapViewWidget.cpp b7c0b34 
>   src/lib/MapWizard.cpp 89a234b 
>   src/lib/MarbleAboutDialog.cpp b9af5c1 
>   src/lib/MarbleCacheSettingsWidget.cpp 35185fc 
>   src/lib/MarbleClock.cpp cc643d9 
>   src/lib/MarbleDirs.cpp 7ee881d 
>   src/lib/MarbleLegendBrowser.cpp f2c0c4c 
>   src/lib/MarbleLineEdit.cpp 1f1a4c7 
>   src/lib/MarbleLocale.cpp 03253c1 
>   src/lib/MarbleMap.cpp 102ed0d 
>   src/lib/MarbleModel.cpp 3c44f9d 
>   src/lib/MarbleNavigator.cpp 54b3611 
>   src/lib/MarblePhysics.cpp 704929a 
>   src/lib/MarblePlacemarkModel.cpp 3057078 
>   src/lib/MarblePluginSettingsWidget.cpp 25e60c9 
>   src/lib/MarbleRunnerManager.cpp d42a203 
>   src/lib/MarbleWidget.cpp efb8dca 
>   src/lib/MarbleWidgetInputHandler.cpp 310bbce 
>   src/lib/MarbleWidgetPopupMenu.cpp ba27f36 
>   src/lib/MercatorScanlineTextureMapper.cpp e0c71c2 
>   src/lib/MergedLayerDecorator.cpp 6363d8e 
>   src/lib/NavigationWidget.cpp e327c6d 
>   src/lib/NewBookmarkFolderDialog.cpp 8a346bc 
>   src/lib/NewstuffModel.cpp b7a2025 
>   src/lib/PlacemarkLayout.cpp 7baffc9 
>   src/lib/Planet.cpp 812e8f9 
>   src/lib/PluginAboutDialog.cpp 832d755 
>   src/lib/PluginItemDelegate.cpp 9efdeb5 
>   src/lib/PluginManager.cpp c707463 
>   src/lib/PopupItem.cpp 2a638cd 
>   src/lib/PositionTracking.cpp 6b2c78d 
>   src/lib/Projections/AbstractProjection.cpp 2af9e05 
>   src/lib/QtMarbleConfigDialog.cpp d12a299 
>   src/lib/Quaternion.cpp d38bdcd 
>   src/lib/RenderPlugin.cpp b9b95c9 
>   src/lib/RoutingRunner.cpp 8609630 
>   src/lib/RunnerTask.cpp 9b0778f 
>   src/lib/ScanlineTextureMapperContext.cpp ff3197b 
>   src/lib/SearchInputWidget.cpp d5779d7 
>   src/lib/SearchWidget.cpp c2d1066 
>   src/lib/SphericalScanlineTextureMapper.cpp 0bfe09c 
>   src/lib/StackedTileLoader.cpp eb90911 
>   src/lib/SunControlWidget.cpp 1546214 
>   src/lib/TextureColorizer.cpp ea933a4 
>   src/lib/TextureTile.cpp 19e3b66 
>   src/lib/Tile.cpp ab18545 
>   src/lib/TileCreator.cpp d7f381b 
>   src/lib/TileCreatorDialog.cpp c264d97 
>   src/lib/TileId.cpp e3aace7 
>   src/lib/TileLoader.cpp 231be10 
>   src/lib/TileScalingTextureMapper.cpp 6d9602c 
>   src/lib/TimeControlWidget.cpp 63c1088 
>   src/lib/TinyWebBrowser.cpp 8ce4949 
>   src/lib/VectorComposer.cpp 4d9600c 
>   src/lib/VectorMap.cpp cf3dcef 
>   src/lib/VectorTileModel.cpp 4f5f3db 
>   src/lib/ViewportParams.cpp 9c4989d 
>   src/lib/VisiblePlacemark.cpp 42c1103 
>   src/lib/WikipediaService.cpp ae1ffdd 
>   src/lib/blendings/BlendingAlgorithms.cpp 6dd9647 
>   src/lib/blendings/BlendingFactory.cpp f51d7c9 
>   src/lib/blendings/SunLightBlending.cpp 6f2f8fb 
>   src/lib/geodata/data/GeoDataCamera.cpp 6e427fe 
>   src/lib/geodata/data/GeoDataContainer.cpp b157e67 
>   src/lib/geodata/data/GeoDataCoordinates.cpp 1f9d140 
>   src/lib/geodata/data/GeoDataData.cpp bf9c069 
>   src/lib/geodata/data/GeoDataExtendedData.cpp fa8e49c 
>   src/lib/geodata/data/GeoDataFeature.cpp 8a99a85 
>   src/lib/geodata/data/GeoDataHotSpot.cpp ca4e4f4 
>   src/lib/geodata/data/GeoDataLabelStyle.cpp 648d421 
>   src/lib/geodata/data/GeoDataLookAt.cpp d18fc86 
>   src/lib/geodata/data/GeoDataObject.cpp e8a6774 
>   src/lib/geodata/data/GeoDataOverlay.cpp 67705c5 
>   src/lib/geodata/data/GeoDataPlacemark.cpp b0c3634 
>   src/lib/geodata/data/GeoDataPoint.cpp 0aa188c 
>   src/lib/geodata/data/GeoDataSimpleArrayData.cpp df50909 
>   src/lib/geodata/data/GeoDataStyleMap.cpp 573831b 
>   src/lib/geodata/data/GeoDataStyleSelector.cpp 7e3bf63 
>   src/lib/geodata/data/GeoDataTimePrimitive.cpp 56c0fc0 
>   src/lib/geodata/data/GeoDataTimeSpan.cpp aa35212 
>   src/lib/geodata/data/GeoDataTimeStamp.cpp b2662c4 
>   src/lib/geodata/data/GeoDataTrack.cpp 73d8b45 
>   src/lib/geodata/graphicsitem/GeoPhotoGraphicsItem.cpp 0632ff8 
>   src/lib/geodata/handlers/dgml/DgmlBrushTagHandler.cpp 50ce419 
>   src/lib/geodata/handlers/dgml/DgmlDownloadUrlTagHandler.cpp 065471b 
>   src/lib/geodata/handlers/dgml/DgmlIconTagHandler.cpp 61b002e 
>   src/lib/geodata/handlers/dgml/DgmlMapTagHandler.cpp 7f9d1b1 
>   src/lib/geodata/handlers/dgml/DgmlPenTagHandler.cpp 687ab61 
>   src/lib/geodata/handlers/kml/KmlBeginTagHandler.cpp 626ea9e 
>   src/lib/geodata/handlers/kml/KmlColorModeTagHandler.cpp a0f97ad 
>   src/lib/geodata/handlers/kml/KmlColorTagHandler.cpp 4bbf14c 
>   src/lib/geodata/handlers/kml/KmlCoordinatesTagHandler.cpp 45bccc3 
>   src/lib/geodata/handlers/kml/KmlEndTagHandler.cpp 6251277 
>   src/lib/geodata/handlers/kml/KmlHrefTagHandler.cpp d1c2518 
>   src/lib/geodata/handlers/kml/KmlStyleUrlTagHandler.cpp 42dad53 
>   src/lib/geodata/handlers/kml/KmlValueTagHandler.cpp 75853ca 
>   src/lib/geodata/handlers/kml/KmlWhenTagHandler.cpp ba1cb31 
>   src/lib/geodata/scene/GeoSceneGeodata.cpp 7624816 
>   src/lib/geodata/scene/GeoSceneTiled.cpp f7018c3 
>   src/lib/geodata/writer/GeoTagWriter.cpp 674e773 
>   src/lib/geodata/writers/kml/KmlDocumentTagWriter.cpp 0669377 
>   src/lib/geodata/writers/kml/KmlFolderTagWriter.cpp 0f2bbec 
>   src/lib/geodata/writers/kml/KmlTimeStampTagWriter.cpp b0815fd 
>   src/lib/graphicsview/FrameGraphicsItem.cpp c4f4418 
>   src/lib/graphicsview/LabelGraphicsItem.cpp c819f72 
>   src/lib/graphicsview/MarbleGraphicsGridLayout.cpp 453a8b6 
>   src/lib/graphicsview/MarbleGraphicsItem.cpp 88cd8db 
>   src/lib/graphicsview/ScreenGraphicsItem.cpp aaf1b2a 
>   src/lib/graphicsview/WidgetGraphicsItem.cpp db8ffa0 
>   src/lib/kdescendantsproxymodel.cpp 1c58897 
>   src/lib/kineticmodel.cpp 54ac8a6 
>   src/lib/layers/FpsLayer.cpp 411c557 
>   src/lib/layers/GeometryLayer.cpp 20fd6a7 
>   src/lib/layers/MarbleSplashLayer.cpp bed786a 
>   src/lib/layers/PlacemarkLayer.cpp 7790af4 
>   src/lib/layers/PopupLayer.cpp 2345f1e 
>   src/lib/layers/TextureLayer.cpp 5b9e9c9 
>   src/lib/layers/VectorTileLayer.cpp c8d5ad2 
>   src/lib/routing/AlternativeRoutesModel.cpp dffc15a 
>   src/lib/routing/RouteRequest.cpp 47404fc 
>   src/lib/routing/RoutingInputWidget.cpp cf1bd89 
>   src/lib/routing/RoutingLayer.cpp 29d45d9 
>   src/lib/routing/RoutingManager.cpp bb99760 
>   src/lib/routing/RoutingModel.cpp 6ff0a92 
>   src/lib/routing/RoutingWidget.cpp 8a4a988 
>   src/lib/routing/instructions/RoutingInstruction.cpp e79d071 
>   src/lib/routing/instructions/RoutingWaypoint.cpp 7046b5f 
>   src/lib/routing/instructions/WaypointParser.cpp 453e30a 
>   src/marble_part.cpp c9e470e 
>   src/plasmoid/worldclock.cpp e74de89 
>   src/plugins/declarative/Bookmarks.cpp 1b771cd 
>   src/plugins/declarative/DeclarativeDataPlugin.cpp 1c7dd34 
>   src/plugins/declarative/DeclarativeMapThemeManager.cpp 5db9ce0 
>   src/plugins/declarative/MapThemeModel.cpp 69dd839 
>   src/plugins/declarative/MarbleDeclarativeObject.cpp 055bd95 
>   src/plugins/declarative/MarbleDeclarativePlugin.cpp d527b3a 
>   src/plugins/declarative/OfflineDataModel.cpp eebcc93 
>   src/plugins/declarative/ZoomButtonInterceptor.cpp 9a19644 
>   src/plugins/designer/latloneditwidget/LatLonEditPlugin.cpp 626f75e 
>   src/plugins/designer/marblewidget/MarbleWidgetPlugin.cpp 15c4f54 
>   src/plugins/designer/navigator/MarbleNavigatorPlugin.cpp 9ca3bb2 
>   src/plugins/positionprovider/geoclue/GeoCute/Accuracy.cpp 44603e2 
>   src/plugins/positionprovider/geoclue/GeoCute/MasterClient.cpp 33011c4 
>   src/plugins/positionprovider/geoclue/GeoCute/PositionProvider.cpp 349ea9a 
>   src/plugins/positionprovider/geoclue/GeoCute/VelocityProvider.cpp 9657e1d 
>   src/plugins/positionprovider/gpsd/GpsdConnection.cpp feb077f 
>   src/plugins/positionprovider/gpsd/GpsdThread.cpp ffb8ed6 
>   src/plugins/positionprovider/maemo/MaemoPositionProviderPlugin.cpp dcf9be6 
>   src/plugins/positionprovider/routesimulation/RouteSimulationPositionProviderPlugin.cpp 294bc4a 
>   src/plugins/positionprovider/wlocate/WlocatePositionProviderPlugin.cpp ae49766 
>   src/plugins/render/annotate/AnnotatePlugin.cpp 3387513 
>   src/plugins/render/annotate/GeoWidgetBubble.cpp 311be63 
>   src/plugins/render/annotate/PlacemarkTextAnnotation.cpp 5b7f9b6 
>   src/plugins/render/annotate/SceneGraphicsItem.cpp 6ce28fb 
>   src/plugins/render/annotate/TextEditor.cpp 2a5f72e 
>   src/plugins/render/aprs/AprsFile.cpp d95ceb2 
>   src/plugins/render/aprs/AprsGatherer.cpp 5b2efbc 
>   src/plugins/render/aprs/AprsObject.cpp 70b37da 
>   src/plugins/render/aprs/AprsPlugin.cpp 550192f 
>   src/plugins/render/aprs/AprsTCPIP.cpp 33a63e8 
>   src/plugins/render/compass/CompassFloatItem.cpp 4e22b2b 
>   src/plugins/render/crosshairs/CrosshairsPlugin.cpp 3863fc9 
>   src/plugins/render/earthquake/EarthquakeItem.cpp 02c2c39 
>   src/plugins/render/earthquake/EarthquakeModel.cpp f021217 
>   src/plugins/render/earthquake/EarthquakePlugin.cpp 1205521 
>   src/plugins/render/elevationprofilefloatitem/ElevationProfileFloatItem.cpp 49808c9 
>   src/plugins/render/elevationprofilefloatitem/ElevationProfilePlotAxis.cpp 0b2bfcd 
>   src/plugins/render/elevationprofilemarker/ElevationProfileMarker.cpp b2b4b01 
>   src/plugins/render/fileview/FileViewFloatItem.cpp 786bc28 
>   src/plugins/render/foursquare/FoursquareItem.cpp 358fa790 
>   src/plugins/render/foursquare/FoursquareModel.cpp 0a0fd62 
>   src/plugins/render/graticule/GraticulePlugin.cpp b14ccf9 
>   src/plugins/render/inhibit-screensaver/InhibitScreensaverPlugin.cpp d646cbf 
>   src/plugins/render/license/License.cpp 7a84ec1 
>   src/plugins/render/mapscale/MapScaleFloatItem.cpp bac707c 
>   src/plugins/render/measure/MeasureToolPlugin.cpp a74c95d 
>   src/plugins/render/navigation/ArrowDiscWidget.cpp 5c2f47b 
>   src/plugins/render/navigation/NavigationButton.cpp e115dd6 
>   src/plugins/render/navigation/NavigationFloatItem.cpp b1166ba 
>   src/plugins/render/opencaching/OpenCachingItem.cpp a7ddcee 
>   src/plugins/render/opencaching/OpenCachingModel.cpp f14476d 
>   src/plugins/render/opencaching/OpenCachingPlugin.cpp a24497d 
>   src/plugins/render/opencachingcom/OpenCachingComItem.cpp f082c54 
>   src/plugins/render/opencachingcom/OpenCachingComModel.cpp ee35912 
>   src/plugins/render/opendesktop/OpenDesktopItem.cpp b089a47 
>   src/plugins/render/opendesktop/OpenDesktopModel.cpp 2b934cc 
>   src/plugins/render/opendesktop/OpenDesktopPlugin.cpp b1cef50 
>   src/plugins/render/overviewmap/OverviewMap.cpp 2df8194 
>   src/plugins/render/panoramio/PanoramioModel.cpp 29199ed 
>   src/plugins/render/photo/FlickrParser.cpp 1578bfa 
>   src/plugins/render/photo/PhotoPlugin.cpp cdb6243 
>   src/plugins/render/photo/PhotoPluginItem.cpp 92e94f2 
>   src/plugins/render/photo/PhotoPluginModel.cpp b35f8dc 
>   src/plugins/render/positionmarker/PositionMarker.cpp 1dd7128 
>   src/plugins/render/postalcode/PostalCodeItem.cpp 170b41f 
>   src/plugins/render/postalcode/PostalCodeModel.cpp 389fe21 
>   src/plugins/render/progress/ProgressFloatItem.cpp ae27b76 
>   src/plugins/render/routing/AudioOutput.cpp 707fbc2 
>   src/plugins/render/routing/RoutingPlugin.cpp e1f2b65 
>   src/plugins/render/satellites/SatellitesConfigAbstractItem.cpp ab8af61 
>   src/plugins/render/satellites/SatellitesConfigLeafItem.cpp 5b2e879 
>   src/plugins/render/satellites/SatellitesConfigNodeItem.cpp 38b96bc 
>   src/plugins/render/satellites/SatellitesPlugin.cpp 922eaee 
>   src/plugins/render/satellites/SatellitesTLEItem.cpp 26fcd49 
>   src/plugins/render/satellites/TrackerPluginModel.cpp e9c3143 
>   src/plugins/render/speedometer/Speedometer.cpp 0c99c6e 
>   src/plugins/render/stars/StarsPlugin.cpp d8d1a08 
>   src/plugins/render/test/TestPlugin.cpp 1f6b74b 
>   src/plugins/render/twitter/twitterPlugin.cpp 795ac3e 
>   src/plugins/render/weather/BBCItemGetter.cpp 71a81e0 
>   src/plugins/render/weather/BBCParser.cpp 1b00ab3 
>   src/plugins/render/weather/BBCStation.cpp 3dbeab8 
>   src/plugins/render/weather/BBCWeatherItem.cpp 99fc023 
>   src/plugins/render/weather/BBCWeatherService.cpp 1717ac4 
>   src/plugins/render/weather/GeoNamesWeatherService.cpp c07d963 
>   src/plugins/render/weather/StationListParser.cpp cfff5d7 
>   src/plugins/render/weather/WeatherData.cpp 979b5f7 
>   src/plugins/render/weather/WeatherItem.cpp b9bf283 
>   src/plugins/render/weather/WeatherModel.cpp ef3d498 
>   src/plugins/render/weather/WeatherPlugin.cpp 4be0c5d 
>   src/plugins/render/wikipedia/GeonamesParser.cpp 266bda6 
>   src/plugins/render/wikipedia/WikipediaItem.cpp 44854ac 
>   src/plugins/render/wikipedia/WikipediaModel.cpp e2d380c 
>   src/plugins/render/wikipedia/WikipediaPlugin.cpp 89cf51e 
>   src/plugins/runner/cache/CacheRunner.cpp 30d5f02 
>   src/plugins/runner/gosmore-reversegeocoding/GosmoreReverseGeocodingPlugin.cpp 56a59da 
>   src/plugins/runner/gosmore-reversegeocoding/GosmoreReverseGeocodingRunner.cpp 4f0811b 
>   src/plugins/runner/gosmore-routing/GosmoreRoutingPlugin.cpp eab31c1 
>   src/plugins/runner/gosmore-routing/GosmoreRoutingRunner.cpp 41ae828 
>   src/plugins/runner/gpx/GpxRunner.cpp c777942 
>   src/plugins/runner/gpx/tests/TestTrack.cpp 2d622a8 
>   src/plugins/runner/hostip/HostipRunner.cpp e2f81ae 
>   src/plugins/runner/json/JsonRunner.cpp 2098e1f 
>   src/plugins/runner/kml/KmlDocument.cpp 98973cd 
>   src/plugins/runner/kml/KmlRunner.cpp 0258398 
>   src/plugins/runner/kml/KmzHandler.cpp 9ad16ce 
>   src/plugins/runner/latlon/LatLonRunner.cpp 7381e36 
>   src/plugins/runner/local-osm-search/DatabaseQuery.cpp 09d55f8 
>   src/plugins/runner/local-osm-search/LocalOsmSearchPlugin.cpp 70cec74 
>   src/plugins/runner/local-osm-search/LocalOsmSearchRunner.cpp dea5fa7 
>   src/plugins/runner/local-osm-search/OsmDatabase.cpp 60ad83f 
>   src/plugins/runner/localdatabase/LocalDatabaseRunner.cpp 7073bcc 
>   src/plugins/runner/log/LogRunner.cpp 6b7973a 
>   src/plugins/runner/mapquest/MapQuestRunner.cpp 5c57df5 
>   src/plugins/runner/monav/MonavConfigWidget.cpp 8b17084 
>   src/plugins/runner/monav/MonavMapsModel.cpp ed3d328 
>   src/plugins/runner/monav/MonavPlugin.cpp 507efb6 
>   src/plugins/runner/monav/MonavRunner.cpp 3b6a86c 
>   src/plugins/runner/nominatim-reversegeocoding/OsmNominatimReverseGeocodingRunner.cpp 73b7298 
>   src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.cpp 251a734 
>   src/plugins/runner/open-source-routing-machine/OSRMRunner.cpp 8359058 
>   src/plugins/runner/openrouteservice/OpenRouteServiceRunner.cpp 126be5e 
>   src/plugins/runner/osm/OsmRunner.cpp 97d551c 
>   src/plugins/runner/osm/handlers/OsmBoundTagHandler.cpp 0dca507 
>   src/plugins/runner/pn2/Pn2Runner.cpp 5ec188f 
>   src/plugins/runner/pnt/PntRunner.cpp 9aa132c 
>   src/plugins/runner/routino/RoutinoRunner.cpp 0066893 
>   src/plugins/runner/shp/ShpRunner.cpp b170568 
>   src/plugins/runner/traveling-salesman/TravelingSalesmanRunner.cpp d43d5af 
>   src/plugins/runner/yours/YoursRunner.cpp cda7e1f 
>   src/plugins/templates/floatitem/FITemplateFloatItem.cpp ce8ec16 
>   src/qt-components/marble-touch/main.cpp 0d5bb44 
>   src/qtmain.cpp 7599214 
>   src/routing-instructions/main.cpp 6f437e0 
>   tests/AbstractDataPluginModelTest.cpp cab6ad0 
>   tests/AbstractDataPluginTest.cpp e07c358 
>   tests/AbstractFloatItemTest.cpp 1941fa5 
>   tests/BookmarkManagerTest.cpp 74f11d3 
>   tests/FrameGraphicsItemTest.cpp 7cc0ade 
>   tests/GeoDataLatLonAltBoxTest.cpp 4a8e029 
>   tests/GeoPolygonTest.cpp 1f68f84 
>   tests/MapViewWidgetTest.cpp de9fb97 
>   tests/MarbleMapTest.cpp 1e03caf 
>   tests/MarbleRunnerManagerTest.cpp 02e370c 
>   tests/MarbleWidgetSpeedTest.cpp 4d4561a 
>   tests/MarbleWidgetTest.cpp f5e1af3 
>   tests/MercatorProjectionTest.cpp 79f7dc2 
>   tests/PlacemarkPositionProviderPluginTest.cpp 0b1bbb7 
>   tests/PluginManagerTest.cpp 26a3126 
>   tests/PositionTrackingTest.cpp faecbae 
>   tests/QuaternionTest.cpp 8a2b073 
>   tests/RenderPluginModelTest.cpp 108a9ce 
>   tests/RenderPluginTest.cpp 87d9a21 
>   tests/ScreenGraphicsItemTest.cpp ad27cd7 
>   tests/TestBalloonStyle.cpp 2cedd36 
>   tests/TestCamera.cpp 4a38b4f 
>   tests/TestGeoData.cpp fe72eaf 
>   tests/TestGeoDataCoordinates.cpp 717c22b 
>   tests/TestGeoDataCopy.cpp ca38ed0 
>   tests/TestGeoDataGeometry.cpp ac221ac 
>   tests/TestGeoDataLatLonAltBox.cpp ae8c2a0 
>   tests/TestGeoDataPack.cpp 7a02bc2 
>   tests/TestGeoDataTrack.cpp fc5d86f 
>   tests/TestGeoDataWriter.cpp 500d092 
>   tests/TestGeoPainter.cpp a72c2bd 
>   tests/TestGeoSceneWriter.cpp f0e7c1e 
>   tests/TestGroundOverlay.cpp 7eeb774 
>   tests/TestGxTimeSpan.cpp 91d31bf 
>   tests/TestGxTimeStamp.cpp 5f6afd8 
>   tests/TestLatLonQuad.cpp 63aaedd 
>   tests/TestListStyle.cpp f2a4933 
>   tests/TestModel.cpp 044bd9b 
>   tests/TestNetworkLink.cpp 7fd30cf 
>   tests/TestOsmAnnotation.cpp 0896455 
>   tests/TestPhotoOverlay.cpp 8fe1d31 
>   tests/TestScreenOverlay.cpp b94d53e 
>   tests/TestTimeSpan.cpp d517377 
>   tests/TestTimeStamp.cpp 8921f49 
>   tests/TestTour.cpp 68c5f1f 
>   tests/TileIdTest.cpp c6d8d88 
>   tests/ViewportParamsTest.cpp 869261a 
>   tools/asc2kml/asc2kml.cpp 3e7b322 
>   tools/constellations2kml/constellations2kml.cpp 62139d9 
>   tools/dateline/dateline.cpp 93836ba 
>   tools/dso2kml/dso2kml.cpp 4e36ec6 
>   tools/iau2kml/iau2kml.cpp a426517 
>   tools/kml2kml/kml2kml.cpp e9b7b27 
>   tools/mapreproject/NasaWorldWindToOpenStreetMapConverter.cpp f6b58bd 
>   tools/mapreproject/NwwMapImage.cpp fca9f02 
>   tools/mapreproject/OsmTileClusterRenderer.cpp 896fffe 
>   tools/mapreproject/Thread.cpp 425b9bf 
>   tools/mapreproject/main.cpp 15cdcfa 
>   tools/maptheme-previewimage/main.cpp da0abe0 
>   tools/osm-addresses/OsmParser.cpp 1f8ba45 
>   tools/osm-addresses/OsmRegion.cpp 1051bcf 
>   tools/osm-addresses/SqlWriter.cpp 293d45d 
>   tools/osm-addresses/main.cpp 75f6a4f 
>   tools/osm-addresses/pbf/PbfParser.cpp 9c1d9f5 
>   tools/osm-addresses/xml/XmlParser.cpp 9bd8806 
>   tools/osm-sisyphus/job.cpp 20367d0 
>   tools/osm-sisyphus/jobmanager.cpp 5641644 
>   tools/osm-sisyphus/jobqueue.cpp 1088abb 
>   tools/osm-sisyphus/logger.cpp ae691e9 
>   tools/osm-sisyphus/main.cpp 6a5cb4e 
>   tools/osm-sisyphus/region.cpp 205c6b2 
>   tools/osm-sisyphus/upload.cpp 79784ee 
>   tools/pnt2svg/pnt2svg.cpp 3e870ce 
>   tools/pntdel/pntdel.cpp 75518b8 
>   tools/pntreplace/pntreplace.cpp b50491c 
>   tools/pntreplace/svgxmlhandler.cpp 86ed2f5 
>   tools/poly2kml/main.cpp 542dd00 
>   tools/shp2pn2/shp2pn2.cpp 86a7c87 
>   tools/speaker-files/main.cpp c8c5637 
>   tools/stars/stars.cpp 471a5fd 
>   tools/svg2pnt/svg2pnt.cpp af37396 
>   tools/svg2pnt/svgxmlhandler.cpp d640769 
>   tools/translations/merge_ts_po.cpp 0ae50df 
> 
> Diff: http://git.reviewboard.kde.org/r/111698/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/20130727/2e3cb85d/attachment-0001.html>


More information about the Marble-devel mailing list