[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [marble] /: remove Qt modules from includes and adjust CMakeLists.txt to add missing modules
From: Michael Zanetti <michael_zanetti () gmx ! net>
Date: 2013-07-28 9:52:39
Message-ID: E1V3NeZ-0006n1-Uu () scm ! kde ! org
[Download RAW message or body]
Git commit 376004bb723e8de16f879e45c312365cebf67f09 by Michael Zanetti.
Committed on 25/07/2013 at 20:15.
Pushed by mzanetti into branch 'master'.
remove Qt modules from includes and adjust CMakeLists.txt to add missing modules
M +19 -15 CMakeLists.txt
M +3 -3 examples/cpp/animation-video/main.cpp
M +1 -1 examples/cpp/basic-routing/main.cpp
M +4 -4 examples/cpp/custom-layers/main.cpp
M +1 -1 examples/cpp/geopainter/main.cpp
M +1 -1 examples/cpp/hello-marble/main.cpp
M +4 -4 examples/cpp/kml-inspector/main.cpp
M +4 -4 examples/cpp/map-controls/main.cpp
M +1 -1 examples/cpp/map-properties/main.cpp
M +2 -2 examples/cpp/reverse-geocoding/main.cpp
M +2 -2 examples/cpp/search/main.cpp
M +7 -7 examples/cpp/vehicletracking/vehicletracking.cpp
M +22 -22 src/ControlView.cpp
M +2 -2 src/KdeMainWindow.cpp
M +4 -4 src/MarbleTest.cpp
M +30 -30 src/QtMainWindow.cpp
M +2 -2 src/kdemain.cpp
M +7 -7 src/lib/AbstractDataPlugin.cpp
M +3 -3 src/lib/AbstractDataPluginItem.cpp
M +7 -7 src/lib/AbstractDataPluginModel.cpp
M +3 -3 src/lib/AbstractFloatItem.cpp
M +1 -1 src/lib/AbstractWorkerThread.cpp
M +5 -5 src/lib/AutoNavigation.cpp
M +1 -1 src/lib/BookmarkManager.cpp
M +6 -6 src/lib/BookmarkManagerDialog.cpp
M +1 -1 src/lib/CacheStoragePolicy.cpp
M +3 -3 src/lib/CurrentLocationWidget.cpp
M +8 -8 src/lib/DataMigration.cpp
M +5 -5 src/lib/DeferredFlag.cpp
M +3 -3 src/lib/DiscCache.cpp
M +12 -12 src/lib/DownloadRegionDialog.cpp
M +1 -1 src/lib/EditBookmarkDialog.cpp
M +2 -2 src/lib/ElevationModel.cpp
M +1 -1 src/lib/EquirectScanlineTextureMapper.cpp
M +3 -3 src/lib/ExternalEditorDialog.cpp
M +5 -5 src/lib/FileLoader.cpp
M +4 -4 src/lib/FileManager.cpp
M +4 -4 src/lib/FileStoragePolicy.cpp
M +5 -5 src/lib/FileStorageWatcher.cpp
M +1 -1 src/lib/FileViewWidget.cpp
M +5 -5 src/lib/GeoDataTreeModel.cpp
M +1 -1 src/lib/GeoGraphicsScene.cpp
M +3 -3 src/lib/GeoPainter.cpp
M +3 -3 src/lib/GeoPolygon.cpp
M +4 -4 src/lib/GoToDialog.cpp
M +4 -4 src/lib/HttpDownloadManager.cpp
M +2 -2 src/lib/HttpJob.cpp
M +1 -1 src/lib/LatLonEdit.cpp
M +4 -4 src/lib/MapThemeDownloadDialog.cpp
M +8 -8 src/lib/MapThemeManager.cpp
M +4 -4 src/lib/MapThemeSortFilterProxyModel.cpp
M +9 -9 src/lib/MapViewWidget.cpp
M +17 -17 src/lib/MapWizard.cpp
M +5 -5 src/lib/MarbleAboutDialog.cpp
M +1 -1 src/lib/MarbleCacheSettingsWidget.cpp
M +1 -1 src/lib/MarbleClock.cpp
M +5 -5 src/lib/MarbleDirs.cpp
M +15 -15 src/lib/MarbleLegendBrowser.cpp
M +7 -7 src/lib/MarbleLineEdit.cpp
M +1 -1 src/lib/MarbleLocale.cpp
M +7 -7 src/lib/MarbleMap.cpp
M +9 -9 src/lib/MarbleModel.cpp
M +3 -3 src/lib/MarbleNavigator.cpp
M +1 -1 src/lib/MarblePhysics.cpp
M +1 -1 src/lib/MarblePlacemarkModel.cpp
M +2 -2 src/lib/MarblePluginSettingsWidget.cpp
M +6 -6 src/lib/MarbleRunnerManager.cpp
M +11 -11 src/lib/MarbleWidget.cpp
M +12 -12 src/lib/MarbleWidgetInputHandler.cpp
M +6 -6 src/lib/MarbleWidgetPopupMenu.cpp
M +1 -1 src/lib/MercatorScanlineTextureMapper.cpp
M +3 -3 src/lib/MergedLayerDecorator.cpp
M +3 -3 src/lib/NavigationWidget.cpp
M +1 -1 src/lib/NewBookmarkFolderDialog.cpp
M +14 -14 src/lib/NewstuffModel.cpp
M +9 -9 src/lib/PlacemarkLayout.cpp
M +3 -3 src/lib/Planet.cpp
M +1 -1 src/lib/PluginAboutDialog.cpp
M +9 -9 src/lib/PluginItemDelegate.cpp
M +3 -3 src/lib/PluginManager.cpp
M +11 -11 src/lib/PopupItem.cpp
M +1 -1 src/lib/PositionTracking.cpp
M +1 -1 src/lib/Projections/AbstractProjection.cpp
M +11 -11 src/lib/QtMarbleConfigDialog.cpp
M +2 -2 src/lib/Quaternion.cpp
M +2 -2 src/lib/RenderPlugin.cpp
M +1 -1 src/lib/RoutingRunner.cpp
M +1 -1 src/lib/RunnerTask.cpp
M +1 -1 src/lib/ScanlineTextureMapperContext.cpp
M +2 -2 src/lib/SearchInputWidget.cpp
M +2 -2 src/lib/SearchWidget.cpp
M +1 -1 src/lib/SphericalScanlineTextureMapper.cpp
M +4 -4 src/lib/StackedTileLoader.cpp
M +1 -1 src/lib/SunControlWidget.cpp
M +9 -9 src/lib/TextureColorizer.cpp
M +1 -1 src/lib/TextureTile.cpp
M +1 -1 src/lib/Tile.cpp
M +8 -8 src/lib/TileCreator.cpp
M +1 -1 src/lib/TileCreatorDialog.cpp
M +2 -2 src/lib/TileId.cpp
M +4 -4 src/lib/TileLoader.cpp
M +2 -2 src/lib/TileScalingTextureMapper.cpp
M +1 -1 src/lib/TimeControlWidget.cpp
M +9 -9 src/lib/TinyWebBrowser.cpp
M +1 -1 src/lib/VectorComposer.cpp
M +2 -2 src/lib/VectorMap.cpp
M +1 -1 src/lib/VectorTileModel.cpp
M +4 -4 src/lib/ViewportParams.cpp
M +4 -4 src/lib/VisiblePlacemark.cpp
M +2 -2 src/lib/WikipediaService.cpp
M +2 -2 src/lib/blendings/BlendingAlgorithms.cpp
M +1 -1 src/lib/blendings/BlendingFactory.cpp
M +1 -1 src/lib/blendings/SunLightBlending.cpp
M +1 -1 src/lib/geodata/data/GeoDataCamera.cpp
M +1 -1 src/lib/geodata/data/GeoDataContainer.cpp
M +7 -7 src/lib/geodata/data/GeoDataCoordinates.cpp
M +1 -1 src/lib/geodata/data/GeoDataData.cpp
M +1 -1 src/lib/geodata/data/GeoDataExtendedData.cpp
M +3 -3 src/lib/geodata/data/GeoDataFeature.cpp
M +1 -1 src/lib/geodata/data/GeoDataHotSpot.cpp
M +1 -1 src/lib/geodata/data/GeoDataLabelStyle.cpp
M +1 -1 src/lib/geodata/data/GeoDataLookAt.cpp
M +4 -4 src/lib/geodata/data/GeoDataObject.cpp
M +2 -2 src/lib/geodata/data/GeoDataOverlay.cpp
M +1 -1 src/lib/geodata/data/GeoDataPlacemark.cpp
M +1 -1 src/lib/geodata/data/GeoDataPoint.cpp
M +2 -2 src/lib/geodata/data/GeoDataSimpleArrayData.cpp
M +1 -1 src/lib/geodata/data/GeoDataStyleMap.cpp
M +1 -1 src/lib/geodata/data/GeoDataStyleSelector.cpp
M +1 -1 src/lib/geodata/data/GeoDataTimePrimitive.cpp
M +1 -1 src/lib/geodata/data/GeoDataTimeSpan.cpp
M +1 -1 src/lib/geodata/data/GeoDataTimeStamp.cpp
M +2 -2 src/lib/geodata/data/GeoDataTrack.cpp
M +2 -2 src/lib/geodata/graphicsitem/GeoPhotoGraphicsItem.cpp
M +3 -3 src/lib/geodata/handlers/dgml/DgmlBrushTagHandler.cpp
M +1 -1 src/lib/geodata/handlers/dgml/DgmlDownloadUrlTagHandler.cpp
M +1 -1 src/lib/geodata/handlers/dgml/DgmlIconTagHandler.cpp
M +1 -1 src/lib/geodata/handlers/dgml/DgmlMapTagHandler.cpp
M +3 -3 src/lib/geodata/handlers/dgml/DgmlPenTagHandler.cpp
M +1 -1 src/lib/geodata/handlers/kml/KmlBeginTagHandler.cpp
M +1 -1 src/lib/geodata/handlers/kml/KmlColorModeTagHandler.cpp
M +1 -1 src/lib/geodata/handlers/kml/KmlColorTagHandler.cpp
M +2 -2 src/lib/geodata/handlers/kml/KmlCoordinatesTagHandler.cpp
M +1 -1 src/lib/geodata/handlers/kml/KmlEndTagHandler.cpp
M +1 -1 src/lib/geodata/handlers/kml/KmlHrefTagHandler.cpp
M +1 -1 src/lib/geodata/handlers/kml/KmlStyleUrlTagHandler.cpp
M +1 -1 src/lib/geodata/handlers/kml/KmlValueTagHandler.cpp
M +1 -1 src/lib/geodata/handlers/kml/KmlWhenTagHandler.cpp
M +1 -1 src/lib/geodata/scene/GeoSceneGeodata.cpp
M +1 -1 src/lib/geodata/scene/GeoSceneTiled.cpp
M +1 -1 src/lib/geodata/writer/GeoTagWriter.cpp
M +1 -1 src/lib/geodata/writers/kml/KmlDocumentTagWriter.cpp
M +1 -1 src/lib/geodata/writers/kml/KmlFolderTagWriter.cpp
M +1 -1 src/lib/geodata/writers/kml/KmlTimeStampTagWriter.cpp
M +3 -3 src/lib/graphicsview/FrameGraphicsItem.cpp
M +4 -4 src/lib/graphicsview/LabelGraphicsItem.cpp
M +4 -4 src/lib/graphicsview/MarbleGraphicsGridLayout.cpp
M +5 -5 src/lib/graphicsview/MarbleGraphicsItem.cpp
M +1 -1 src/lib/graphicsview/ScreenGraphicsItem.cpp
M +4 -4 src/lib/graphicsview/WidgetGraphicsItem.cpp
M +2 -2 src/lib/kdescendantsproxymodel.cpp
M +2 -2 src/lib/kineticmodel.cpp
M +4 -4 src/lib/layers/FpsLayer.cpp
M +3 -3 src/lib/layers/GeometryLayer.cpp
M +1 -1 src/lib/layers/MarbleSplashLayer.cpp
M +3 -3 src/lib/layers/PlacemarkLayer.cpp
M +3 -3 src/lib/layers/PopupLayer.cpp
M +2 -2 src/lib/layers/TextureLayer.cpp
M +2 -2 src/lib/layers/VectorTileLayer.cpp
M +2 -2 src/lib/routing/AlternativeRoutesModel.cpp
M +2 -2 src/lib/routing/RouteRequest.cpp
M +9 -9 src/lib/routing/RoutingInputWidget.cpp
M +9 -9 src/lib/routing/RoutingLayer.cpp
M +3 -3 src/lib/routing/RoutingManager.cpp
M +9 -9 src/lib/routing/RoutingModel.cpp
M +10 -10 src/lib/routing/RoutingWidget.cpp
M +2 -2 src/lib/routing/instructions/RoutingInstruction.cpp
M +1 -1 src/lib/routing/instructions/RoutingWaypoint.cpp
M +2 -2 src/lib/routing/instructions/WaypointParser.cpp
M +13 -13 src/marble_part.cpp
M +10 -10 src/plasmoid/worldclock.cpp
M +1 -1 src/plugins/declarative/Bookmarks.cpp
M +3 -3 src/plugins/declarative/DeclarativeDataPlugin.cpp
M +3 -3 src/plugins/declarative/DeclarativeMapThemeManager.cpp
M +3 -3 src/plugins/declarative/MapThemeModel.cpp
M +1 -1 src/plugins/declarative/MarbleDeclarativeObject.cpp
M +2 -2 src/plugins/declarative/MarbleDeclarativePlugin.cpp
M +2 -2 src/plugins/declarative/OfflineDataModel.cpp
M +2 -2 src/plugins/declarative/ZoomButtonInterceptor.cpp
M +6 -6 src/plugins/designer/latloneditwidget/LatLonEditPlugin.cpp
M +1 -1 src/plugins/designer/marblewidget/MarbleWidgetPlugin.cpp
M +1 -1 src/plugins/designer/navigator/MarbleNavigatorPlugin.cpp
M +1 -1 src/plugins/positionprovider/geoclue/GeoCute/Accuracy.cpp
M +4 -4 src/plugins/positionprovider/geoclue/GeoCute/MasterClient.cpp
M +3 -3 src/plugins/positionprovider/geoclue/GeoCute/PositionProvider.cpp
M +1 -1 src/plugins/positionprovider/geoclue/GeoCute/VelocityProvider.cpp
M +1 -1 src/plugins/positionprovider/gpsd/GpsdConnection.cpp
M +1 -1 src/plugins/positionprovider/gpsd/GpsdThread.cpp
M +1 -1 src/plugins/positionprovider/maemo/MaemoPositionProviderPlugin.cpp
M +1 -1 src/plugins/positionprovider/routesimulation/RouteSimulationPositionProviderPlugin.cpp
M +2 -2 src/plugins/positionprovider/wlocate/WlocatePositionProviderPlugin.cpp
M +6 -6 src/plugins/render/annotate/AnnotatePlugin.cpp
M +2 -2 src/plugins/render/annotate/GeoWidgetBubble.cpp
M +1 -1 src/plugins/render/annotate/PlacemarkTextAnnotation.cpp
M +1 -1 src/plugins/render/annotate/SceneGraphicsItem.cpp
M +6 -6 src/plugins/render/annotate/TextEditor.cpp
M +1 -1 src/plugins/render/aprs/AprsFile.cpp
M +1 -1 src/plugins/render/aprs/AprsGatherer.cpp
M +1 -1 src/plugins/render/aprs/AprsObject.cpp
M +6 -6 src/plugins/render/aprs/AprsPlugin.cpp
M +1 -1 src/plugins/render/aprs/AprsTCPIP.cpp
M +6 -6 src/plugins/render/compass/CompassFloatItem.cpp
M +5 -5 src/plugins/render/crosshairs/CrosshairsPlugin.cpp
M +4 -4 src/plugins/render/earthquake/EarthquakeItem.cpp
M +7 -7 src/plugins/render/earthquake/EarthquakeModel.cpp
M +2 -2 src/plugins/render/earthquake/EarthquakePlugin.cpp
M +4 -4 src/plugins/render/elevationprofilefloatitem/ElevationProfileFloatItem.cpp
M +1 -1 src/plugins/render/elevationprofilefloatitem/ElevationProfilePlotAxis.cpp
M +1 -1 src/plugins/render/elevationprofilemarker/ElevationProfileMarker.cpp
M +10 -10 src/plugins/render/fileview/FileViewFloatItem.cpp
M +3 -3 src/plugins/render/foursquare/FoursquareItem.cpp
M +4 -4 src/plugins/render/foursquare/FoursquareModel.cpp
M +7 -7 src/plugins/render/graticule/GraticulePlugin.cpp
M +3 -3 src/plugins/render/inhibit-screensaver/InhibitScreensaverPlugin.cpp
M +5 -5 src/plugins/render/license/License.cpp
M +8 -8 src/plugins/render/mapscale/MapScaleFloatItem.cpp
M +5 -5 src/plugins/render/measure/MeasureToolPlugin.cpp
M +4 -4 src/plugins/render/navigation/ArrowDiscWidget.cpp
M +2 -2 src/plugins/render/navigation/NavigationButton.cpp
M +7 -7 src/plugins/render/navigation/NavigationFloatItem.cpp
M +2 -2 src/plugins/render/opencaching/OpenCachingItem.cpp
M +4 -4 src/plugins/render/opencaching/OpenCachingModel.cpp
M +1 -1 src/plugins/render/opencaching/OpenCachingPlugin.cpp
M +4 -4 src/plugins/render/opencachingcom/OpenCachingComItem.cpp
M +5 -5 src/plugins/render/opencachingcom/OpenCachingComModel.cpp
M +1 -1 src/plugins/render/opendesktop/OpenDesktopItem.cpp
M +5 -5 src/plugins/render/opendesktop/OpenDesktopModel.cpp
M +1 -1 src/plugins/render/opendesktop/OpenDesktopPlugin.cpp
M +10 -10 src/plugins/render/overviewmap/OverviewMap.cpp
M +2 -2 src/plugins/render/panoramio/PanoramioModel.cpp
M +1 -1 src/plugins/render/photo/FlickrParser.cpp
M +3 -3 src/plugins/render/photo/PhotoPlugin.cpp
M +7 -7 src/plugins/render/photo/PhotoPluginItem.cpp
M +3 -3 src/plugins/render/photo/PhotoPluginModel.cpp
M +6 -6 src/plugins/render/positionmarker/PositionMarker.cpp
M +2 -2 src/plugins/render/postalcode/PostalCodeItem.cpp
M +5 -5 src/plugins/render/postalcode/PostalCodeModel.cpp
M +5 -5 src/plugins/render/progress/ProgressFloatItem.cpp
M +1 -1 src/plugins/render/routing/AudioOutput.cpp
M +10 -10 src/plugins/render/routing/RoutingPlugin.cpp
M +1 -1 src/plugins/render/satellites/SatellitesConfigAbstractItem.cpp
M +1 -1 src/plugins/render/satellites/SatellitesConfigLeafItem.cpp
M +2 -2 src/plugins/render/satellites/SatellitesConfigNodeItem.cpp
M +2 -2 src/plugins/render/satellites/SatellitesPlugin.cpp
M +5 -5 src/plugins/render/satellites/SatellitesTLEItem.cpp
M +1 -1 src/plugins/render/satellites/TrackerPluginModel.cpp
M +1 -1 src/plugins/render/speedometer/Speedometer.cpp
M +7 -7 src/plugins/render/stars/StarsPlugin.cpp
M +3 -3 src/plugins/render/test/TestPlugin.cpp
M +3 -3 src/plugins/render/twitter/twitterPlugin.cpp
M +2 -2 src/plugins/render/weather/BBCItemGetter.cpp
M +5 -5 src/plugins/render/weather/BBCParser.cpp
M +2 -2 src/plugins/render/weather/BBCStation.cpp
M +3 -3 src/plugins/render/weather/BBCWeatherItem.cpp
M +4 -4 src/plugins/render/weather/BBCWeatherService.cpp
M +5 -5 src/plugins/render/weather/GeoNamesWeatherService.cpp
M +2 -2 src/plugins/render/weather/StationListParser.cpp
M +6 -6 src/plugins/render/weather/WeatherData.cpp
M +11 -11 src/plugins/render/weather/WeatherItem.cpp
M +2 -2 src/plugins/render/weather/WeatherModel.cpp
M +4 -4 src/plugins/render/weather/WeatherPlugin.cpp
M +1 -1 src/plugins/render/wikipedia/GeonamesParser.cpp
M +6 -6 src/plugins/render/wikipedia/WikipediaItem.cpp
M +7 -7 src/plugins/render/wikipedia/WikipediaModel.cpp
M +2 -2 src/plugins/render/wikipedia/WikipediaPlugin.cpp
M +1 -1 src/plugins/runner/cache/CacheRunner.cpp
M +2 -2 src/plugins/runner/gosmore-reversegeocoding/GosmoreReverseGeocodingPlugin.cpp
M +2 -2 src/plugins/runner/gosmore-reversegeocoding/GosmoreReverseGeocodingRunner.cpp
M +2 -2 src/plugins/runner/gosmore-routing/GosmoreRoutingPlugin.cpp
M +2 -2 src/plugins/runner/gosmore-routing/GosmoreRoutingRunner.cpp
M +1 -1 src/plugins/runner/gpx/GpxRunner.cpp
M +2 -2 src/plugins/runner/gpx/tests/TestTrack.cpp
M +5 -5 src/plugins/runner/hostip/HostipRunner.cpp
M +1 -1 src/plugins/runner/json/JsonRunner.cpp
M +2 -2 src/plugins/runner/kml/KmlDocument.cpp
M +2 -2 src/plugins/runner/kml/KmlRunner.cpp
M +2 -2 src/plugins/runner/kml/KmzHandler.cpp
M +4 -4 src/plugins/runner/latlon/LatLonRunner.cpp
M +1 -1 src/plugins/runner/local-osm-search/DatabaseQuery.cpp
M +1 -1 src/plugins/runner/local-osm-search/LocalOsmSearchPlugin.cpp
M +3 -3 src/plugins/runner/local-osm-search/LocalOsmSearchRunner.cpp
M +10 -10 src/plugins/runner/local-osm-search/OsmDatabase.cpp
M +4 -4 src/plugins/runner/localdatabase/LocalDatabaseRunner.cpp
M +2 -2 src/plugins/runner/log/LogRunner.cpp
M +7 -7 src/plugins/runner/mapquest/MapQuestRunner.cpp
M +12 -12 src/plugins/runner/monav/MonavConfigWidget.cpp
M +1 -1 src/plugins/runner/monav/MonavMapsModel.cpp
M +6 -6 src/plugins/runner/monav/MonavPlugin.cpp
M +3 -3 src/plugins/runner/monav/MonavRunner.cpp
M +7 -7 src/plugins/runner/nominatim-reversegeocoding/OsmNominatimReverseGeocodingRunner.cpp
M +7 -7 src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.cpp
M +10 -10 src/plugins/runner/open-source-routing-machine/OSRMRunner.cpp
M +7 -7 src/plugins/runner/openrouteservice/OpenRouteServiceRunner.cpp
M +1 -1 src/plugins/runner/osm/OsmRunner.cpp
M +1 -1 src/plugins/runner/osm/handlers/OsmBoundTagHandler.cpp
M +2 -2 src/plugins/runner/pn2/Pn2Runner.cpp
M +3 -3 src/plugins/runner/pnt/PntRunner.cpp
M +3 -3 src/plugins/runner/routino/RoutinoRunner.cpp
M +1 -1 src/plugins/runner/shp/ShpRunner.cpp
M +3 -3 src/plugins/runner/traveling-salesman/TravelingSalesmanRunner.cpp
M +9 -9 src/plugins/runner/yours/YoursRunner.cpp
M +4 -4 src/plugins/templates/floatitem/FITemplateFloatItem.cpp
M +2 -2 src/qt-components/marble-touch/main.cpp
M +8 -8 src/qtmain.cpp
M +8 -8 src/routing-instructions/main.cpp
M +1 -1 tests/AbstractDataPluginModelTest.cpp
M +1 -1 tests/AbstractDataPluginTest.cpp
M +2 -2 tests/AbstractFloatItemTest.cpp
M +2 -2 tests/BookmarkManagerTest.cpp
M +1 -1 tests/FrameGraphicsItemTest.cpp
M +2 -2 tests/GeoDataLatLonAltBoxTest.cpp
M +4 -4 tests/GeoPolygonTest.cpp
M +2 -2 tests/MapViewWidgetTest.cpp
M +1 -1 tests/MarbleMapTest.cpp
M +3 -3 tests/MarbleRunnerManagerTest.cpp
M +4 -4 tests/MarbleWidgetSpeedTest.cpp
M +3 -3 tests/MarbleWidgetTest.cpp
M +1 -1 tests/MercatorProjectionTest.cpp
M +1 -1 tests/PlacemarkPositionProviderPluginTest.cpp
M +1 -1 tests/PluginManagerTest.cpp
M +1 -1 tests/PositionTrackingTest.cpp
M +2 -2 tests/QuaternionTest.cpp
M +1 -1 tests/RenderPluginModelTest.cpp
M +1 -1 tests/RenderPluginTest.cpp
M +1 -1 tests/ScreenGraphicsItemTest.cpp
M +2 -2 tests/TestBalloonStyle.cpp
M +2 -2 tests/TestCamera.cpp
M +3 -3 tests/TestGeoData.cpp
M +2 -2 tests/TestGeoDataCoordinates.cpp
M +5 -5 tests/TestGeoDataCopy.cpp
M +2 -2 tests/TestGeoDataGeometry.cpp
M +1 -1 tests/TestGeoDataLatLonAltBox.cpp
M +6 -6 tests/TestGeoDataPack.cpp
M +2 -2 tests/TestGeoDataTrack.cpp
M +4 -4 tests/TestGeoDataWriter.cpp
M +2 -2 tests/TestGeoPainter.cpp
M +5 -5 tests/TestGeoSceneWriter.cpp
M +2 -2 tests/TestGroundOverlay.cpp
M +2 -2 tests/TestGxTimeSpan.cpp
M +2 -2 tests/TestGxTimeStamp.cpp
M +2 -2 tests/TestLatLonQuad.cpp
M +2 -2 tests/TestListStyle.cpp
M +2 -2 tests/TestModel.cpp
M +2 -2 tests/TestNetworkLink.cpp
M +2 -2 tests/TestOsmAnnotation.cpp
M +2 -2 tests/TestPhotoOverlay.cpp
M +2 -2 tests/TestScreenOverlay.cpp
M +2 -2 tests/TestTimeSpan.cpp
M +2 -2 tests/TestTimeStamp.cpp
M +2 -2 tests/TestTour.cpp
M +2 -2 tests/TileIdTest.cpp
M +1 -1 tests/ViewportParamsTest.cpp
M +4 -4 tools/asc2kml/asc2kml.cpp
M +3 -3 tools/constellations2kml/constellations2kml.cpp
M +5 -5 tools/dateline/dateline.cpp
M +3 -3 tools/dso2kml/dso2kml.cpp
M +4 -4 tools/iau2kml/iau2kml.cpp
M +1 -1 tools/kml2kml/kml2kml.cpp
M +4 -4 tools/mapreproject/NasaWorldWindToOpenStreetMapConverter.cpp
M +1 -1 tools/mapreproject/NwwMapImage.cpp
M +2 -2 tools/mapreproject/OsmTileClusterRenderer.cpp
M +1 -1 tools/mapreproject/Thread.cpp
M +6 -6 tools/mapreproject/main.cpp
M +4 -4 tools/maptheme-previewimage/main.cpp
M +2 -2 tools/osm-addresses/OsmParser.cpp
M +1 -1 tools/osm-addresses/OsmRegion.cpp
M +5 -5 tools/osm-addresses/SqlWriter.cpp
M +4 -4 tools/osm-addresses/main.cpp
M +1 -1 tools/osm-addresses/pbf/PbfParser.cpp
M +1 -1 tools/osm-addresses/xml/XmlParser.cpp
M +3 -3 tools/osm-sisyphus/job.cpp
M +6 -6 tools/osm-sisyphus/jobmanager.cpp
M +2 -2 tools/osm-sisyphus/jobqueue.cpp
M +5 -5 tools/osm-sisyphus/logger.cpp
M +2 -2 tools/osm-sisyphus/main.cpp
M +1 -1 tools/osm-sisyphus/region.cpp
M +7 -7 tools/osm-sisyphus/upload.cpp
M +6 -6 tools/pnt2svg/pnt2svg.cpp
M +5 -5 tools/pntdel/pntdel.cpp
M +7 -7 tools/pntreplace/pntreplace.cpp
M +1 -1 tools/pntreplace/svgxmlhandler.cpp
M +6 -6 tools/poly2kml/main.cpp
M +7 -7 tools/shp2pn2/shp2pn2.cpp
M +12 -12 tools/speaker-files/main.cpp
M +3 -3 tools/stars/stars.cpp
M +2 -2 tools/svg2pnt/svg2pnt.cpp
M +1 -1 tools/svg2pnt/svgxmlhandler.cpp
M +4 -4 tools/translations/merge_ts_po.cpp
http://commits.kde.org/marble/376004bb723e8de16f879e45c312365cebf67f09
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bad9e74..69c2fbe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -251,22 +251,26 @@ 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 )
- 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/" )
- marble_set_package_properties( Qt4 PROPERTIES TYPE REQUIRED PURPOSE "core \
framework" )
- IF ( NOT QT_QTDECLARATIVE_LIBRARY )
- # older cmake versions have a FindQt4.cmake without support for declarative,
- # but the library may still be available
- FIND_LIBRARY(QT_QTDECLARATIVE_LIBRARY NAMES QtDeclarative HINTS \
${QT_LIBRARY_DIR})
- ENDIF()
+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_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/" ) +marble_set_package_properties( Qt4 PROPERTIES TYPE REQUIRED \
PURPOSE "core framework" ) +IF ( NOT QT_QTDECLARATIVE_LIBRARY )
+ # older cmake versions have a FindQt4.cmake without support for declarative,
+ # but the library may still be available
+ 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)
diff --git a/examples/cpp/animation-video/main.cpp \
b/examples/cpp/animation-video/main.cpp index 22f9cda..b64d3d5 100644
--- a/examples/cpp/animation-video/main.cpp
+++ b/examples/cpp/animation-video/main.cpp
@@ -23,9 +23,9 @@
#include <opencv2/highgui/highgui.hpp>
#include <opencv2/imgproc/imgproc.hpp>
-#include <QtCore/QTimeLine>
-#include <QtCore/qmath.h>
-#include <QtGui/QApplication>
+#include <QTimeLine>
+#include <qmath.h>
+#include <QApplication>
#include <cstdio>
diff --git a/examples/cpp/basic-routing/main.cpp \
b/examples/cpp/basic-routing/main.cpp index 951b820..f89bfdb 100644
--- a/examples/cpp/basic-routing/main.cpp
+++ b/examples/cpp/basic-routing/main.cpp
@@ -8,7 +8,7 @@
// Copyright 2012 Dennis Nienhüser <earthwings@gentoo.org>
//
-#include <QtGui/QApplication>
+#include <QApplication>
#include <marble/MarbleWidget.h>
#include <marble/MarbleModel.h>
#include <marble/RouteRequest.h>
diff --git a/examples/cpp/custom-layers/main.cpp \
b/examples/cpp/custom-layers/main.cpp index 1f2fe34..3de05b5 100644
--- a/examples/cpp/custom-layers/main.cpp
+++ b/examples/cpp/custom-layers/main.cpp
@@ -15,10 +15,10 @@
#include <marble/GeoDataLineString.h>
#include <marble/LayerInterface.h>
-#include <QtCore/QTime>
-#include <QtCore/QTimer>
-#include <QtGui/QApplication>
-#include <QtGui/QKeyEvent>
+#include <QTime>
+#include <QTimer>
+#include <QApplication>
+#include <QKeyEvent>
using namespace Marble;
diff --git a/examples/cpp/geopainter/main.cpp b/examples/cpp/geopainter/main.cpp
index 61a9d30..a1aa719 100644
--- a/examples/cpp/geopainter/main.cpp
+++ b/examples/cpp/geopainter/main.cpp
@@ -8,7 +8,7 @@
// Copyright 2012 Dennis Nienhüser <earthwings@gentoo.org>
//
-#include <QtGui/QApplication>
+#include <QApplication>
#include <marble/MarbleWidget.h>
#include <marble/GeoPainter.h>
diff --git a/examples/cpp/hello-marble/main.cpp b/examples/cpp/hello-marble/main.cpp
index 74da815..5e05302 100644
--- a/examples/cpp/hello-marble/main.cpp
+++ b/examples/cpp/hello-marble/main.cpp
@@ -8,7 +8,7 @@
// Copyright 2012 Dennis Nienhüser <earthwings@gentoo.org>
//
-#include <QtGui/QApplication>
+#include <QApplication>
#include <marble/MarbleWidget.h>
using namespace Marble;
diff --git a/examples/cpp/kml-inspector/main.cpp \
b/examples/cpp/kml-inspector/main.cpp index ae659b3..3d45f31 100644
--- a/examples/cpp/kml-inspector/main.cpp
+++ b/examples/cpp/kml-inspector/main.cpp
@@ -8,10 +8,10 @@
// Copyright 2012 Dennis Nienhüser <earthwings@gentoo.org>
//
-#include <QtCore/QDebug>
-#include <QtCore/QFileInfo>
-#include <QtGui/QApplication>
-#include <QtGui/QTreeView>
+#include <QDebug>
+#include <QFileInfo>
+#include <QApplication>
+#include <QTreeView>
#include <marble/MarbleWidget.h>
#include <marble/MarbleModel.h>
diff --git a/examples/cpp/map-controls/main.cpp b/examples/cpp/map-controls/main.cpp
index 349505f..d217a35 100644
--- a/examples/cpp/map-controls/main.cpp
+++ b/examples/cpp/map-controls/main.cpp
@@ -8,11 +8,11 @@
// Copyright 2012 Dennis Nienhüser <earthwings@gentoo.org>
//
-#include <QtGui/QApplication>
+#include <QApplication>
-#include <QtGui/QLayout>
-#include <QtGui/QSlider>
-#include <QtGui/QLabel>
+#include <QLayout>
+#include <QSlider>
+#include <QLabel>
#include <marble/MarbleWidget.h>
diff --git a/examples/cpp/map-properties/main.cpp \
b/examples/cpp/map-properties/main.cpp index 1bdf65d..495dcc9 100644
--- a/examples/cpp/map-properties/main.cpp
+++ b/examples/cpp/map-properties/main.cpp
@@ -8,7 +8,7 @@
// Copyright 2012 Dennis Nienhüser <earthwings@gentoo.org>
//
-#include <QtGui/QApplication>
+#include <QApplication>
#include <marble/MarbleGlobal.h>
#include <marble/MarbleWidget.h>
diff --git a/examples/cpp/reverse-geocoding/main.cpp \
b/examples/cpp/reverse-geocoding/main.cpp index 0648e91..1ca8b57 100644
--- a/examples/cpp/reverse-geocoding/main.cpp
+++ b/examples/cpp/reverse-geocoding/main.cpp
@@ -8,8 +8,8 @@
// Copyright 2012 Dennis Nienhüser <earthwings@gentoo.org>
//
-#include <QtGui/QApplication>
-#include <QtCore/QDebug>
+#include <QApplication>
+#include <QDebug>
#include <marble/MarbleWidget.h>
#include <marble/MarbleModel.h>
diff --git a/examples/cpp/search/main.cpp b/examples/cpp/search/main.cpp
index b7790fb..4dc51f4 100644
--- a/examples/cpp/search/main.cpp
+++ b/examples/cpp/search/main.cpp
@@ -8,8 +8,8 @@
// Copyright 2012 Dennis Nienhüser <earthwings@gentoo.org>
//
-#include <QtGui/QApplication>
-#include <QtCore/QDebug>
+#include <QApplication>
+#include <QDebug>
#include <marble/MarbleWidget.h>
#include <marble/MarbleModel.h>
diff --git a/examples/cpp/vehicletracking/vehicletracking.cpp \
b/examples/cpp/vehicletracking/vehicletracking.cpp index 29a606f..1337cd0 100644
--- a/examples/cpp/vehicletracking/vehicletracking.cpp
+++ b/examples/cpp/vehicletracking/vehicletracking.cpp
@@ -8,13 +8,13 @@
// Copyright 2012 Illya Kovalevskyy <illya.kovalevskyy@gmail.com>
//
-#include <QtGui/QApplication>
-#include <QtCore/QThread>
-#include <QtCore/QTimer>
-#include <QtCore/QHash>
-#include <QtCore/qmath.h>
-#include <QtCore/QDebug>
-#include <QtGui/QVBoxLayout>
+#include <QApplication>
+#include <QThread>
+#include <QTimer>
+#include <QHash>
+#include <qmath.h>
+#include <QDebug>
+#include <QVBoxLayout>
#include <marble/MarbleWidget.h>
#include <marble/MarbleGlobal.h>
diff --git a/src/ControlView.cpp b/src/ControlView.cpp
index 795c83e..46f1b67 100644
--- a/src/ControlView.cpp
+++ b/src/ControlView.cpp
@@ -12,28 +12,28 @@
#include "ControlView.h"
-#include <QtGui/QLayout>
-#include <QtGui/QSplitter>
-#include <QtGui/QStringListModel>
-#include <QtGui/QPrintDialog>
-#include <QtGui/QPrintPreviewDialog>
-#include <QtGui/QPrinter>
-#include <QtGui/QPainter>
-#include <QtGui/QTextDocument>
-#include <QtCore/QPointer>
-#include <QtCore/QUrl>
-#include <QtGui/QDesktopServices>
-#include <QtNetwork/QNetworkAccessManager>
-#include <QtNetwork/QNetworkReply>
-#include <QtNetwork/QNetworkRequest>
-#include <QtCore/QProcess>
-#include <QtCore/QTimer>
-#include <QtCore/QFileInfo>
-#include <QtGui/QMessageBox>
-#include <QtGui/QMainWindow>
-#include <QtGui/QDockWidget>
-#include <QtGui/QShortcut>
-#include <QtGui/QMenu>
+#include <QLayout>
+#include <QSplitter>
+#include <QStringListModel>
+#include <QPrintDialog>
+#include <QPrintPreviewDialog>
+#include <QPrinter>
+#include <QPainter>
+#include <QTextDocument>
+#include <QPointer>
+#include <QUrl>
+#include <QDesktopServices>
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
+#include <QNetworkRequest>
+#include <QProcess>
+#include <QTimer>
+#include <QFileInfo>
+#include <QMessageBox>
+#include <QMainWindow>
+#include <QDockWidget>
+#include <QShortcut>
+#include <QMenu>
#include "GeoSceneDocument.h"
#include "GeoSceneHead.h"
diff --git a/src/KdeMainWindow.cpp b/src/KdeMainWindow.cpp
index 1e4b07a..ba5dae6 100644
--- a/src/KdeMainWindow.cpp
+++ b/src/KdeMainWindow.cpp
@@ -13,8 +13,8 @@
#include "KdeMainWindow.h"
// Qt
-#include <QtGui/QProgressBar>
-#include <QtGui/QToolBar>
+#include <QProgressBar>
+#include <QToolBar>
// KDE
#include <kaction.h>
diff --git a/src/MarbleTest.cpp b/src/MarbleTest.cpp
index 6e14c91..830438e 100644
--- a/src/MarbleTest.cpp
+++ b/src/MarbleTest.cpp
@@ -11,10 +11,10 @@
#include "MarbleTest.h"
-#include <QtCore/QCoreApplication>
-#include <QtCore/QTime>
-#include <QtGui/QMessageBox>
-#include <QtGui/QFileDialog>
+#include <QCoreApplication>
+#include <QTime>
+#include <QMessageBox>
+#include <QFileDialog>
#include <MarbleGlobal.h>
#include <MarbleDebug.h>
diff --git a/src/QtMainWindow.cpp b/src/QtMainWindow.cpp
index cda67ce..378cc81 100644
--- a/src/QtMainWindow.cpp
+++ b/src/QtMainWindow.cpp
@@ -14,35 +14,35 @@
#include "QtMainWindow.h"
#include "MarbleDebug.h"
-#include <QtCore/QList>
-#include <QtCore/QSettings>
-#include <QtCore/QUrl>
-#include <QtGui/QCloseEvent>
-#include <QtCore/QTimer>
-#include <QtCore/QVariant>
-#include <QtCore/QVector>
-
-#include <QtGui/QAction>
-#include <QtGui/QLabel>
-#include <QtGui/QWhatsThis>
-#include <QtGui/QApplication>
-#include <QtGui/QIcon>
-#include <QtGui/QMenuBar>
-#include <QtGui/QStatusBar>
-#include <QtGui/QProgressBar>
-#include <QtGui/QToolBar>
-#include <QtGui/QDesktopServices>
-#include <QtGui/QFileDialog>
-#include <QtGui/QMessageBox>
-#include <QtGui/QPrintDialog>
-#include <QtGui/QPrinter>
-#include <QtGui/QDialogButtonBox>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QScrollArea>
-#include <QtGui/QClipboard>
-#include <QtGui/QShortcut>
-#include <QtGui/QDockWidget>
-#include <QtNetwork/QNetworkProxy>
+#include <QList>
+#include <QSettings>
+#include <QUrl>
+#include <QCloseEvent>
+#include <QTimer>
+#include <QVariant>
+#include <QVector>
+
+#include <QAction>
+#include <QLabel>
+#include <QWhatsThis>
+#include <QApplication>
+#include <QIcon>
+#include <QMenuBar>
+#include <QStatusBar>
+#include <QProgressBar>
+#include <QToolBar>
+#include <QDesktopServices>
+#include <QFileDialog>
+#include <QMessageBox>
+#include <QPrintDialog>
+#include <QPrinter>
+#include <QDialogButtonBox>
+#include <QHBoxLayout>
+#include <QScrollArea>
+#include <QClipboard>
+#include <QShortcut>
+#include <QDockWidget>
+#include <QNetworkProxy>
#include "EditBookmarkDialog.h"
#include "BookmarkManagerDialog.h"
@@ -82,7 +82,7 @@
// For zoom buttons on Maemo
#ifdef Q_WS_MAEMO_5
-#include <QtGui/QX11Info>
+#include <QX11Info>
#include <X11/Xlib.h>
#include <X11/Xatom.h>
#endif // Q_WS_MAEMO_5
diff --git a/src/kdemain.cpp b/src/kdemain.cpp
index 10dfd04..6983b61 100644
--- a/src/kdemain.cpp
+++ b/src/kdemain.cpp
@@ -18,7 +18,7 @@
#include <KConfigGroup>
#include <KGlobal>
-#include <QtCore/QFile>
+#include <QFile>
#include "ControlView.h"
#include "KdeMainWindow.h"
@@ -27,7 +27,7 @@
#include "MarbleTest.h"
#ifdef STATIC_BUILD
- #include <QtCore/QtPlugin>
+ #include <QtPlugin>
Q_IMPORT_PLUGIN(qjpeg)
Q_IMPORT_PLUGIN(qsvg)
#endif
diff --git a/src/lib/AbstractDataPlugin.cpp b/src/lib/AbstractDataPlugin.cpp
index 347f4b1..70b24c2 100644
--- a/src/lib/AbstractDataPlugin.cpp
+++ b/src/lib/AbstractDataPlugin.cpp
@@ -21,13 +21,13 @@
#include "MarbleDebug.h"
// Qt
-#include <QtCore/QEvent>
-#include <QtCore/QTimer>
-#include <QtGui/QMouseEvent>
-#include <QtGui/QRegion>
-#include <QtDeclarative/QDeclarativeComponent>
-#include <QtDeclarative/QDeclarativeItem>
-#include <QtDeclarative/QDeclarativeContext>
+#include <QEvent>
+#include <QTimer>
+#include <QMouseEvent>
+#include <QRegion>
+#include <QDeclarativeComponent>
+#include <QDeclarativeItem>
+#include <QDeclarativeContext>
namespace Marble
{
diff --git a/src/lib/AbstractDataPluginItem.cpp b/src/lib/AbstractDataPluginItem.cpp
index 13bdf59..30ce29b 100644
--- a/src/lib/AbstractDataPluginItem.cpp
+++ b/src/lib/AbstractDataPluginItem.cpp
@@ -17,9 +17,9 @@
#include "MarbleDebug.h"
// Qt
-#include <QtGui/QAction>
-#include <QtCore/QRect>
-#include <QtCore/QSize>
+#include <QAction>
+#include <QRect>
+#include <QSize>
namespace Marble
{
diff --git a/src/lib/AbstractDataPluginModel.cpp \
b/src/lib/AbstractDataPluginModel.cpp index f496bb5..9bf8c17 100644
--- a/src/lib/AbstractDataPluginModel.cpp
+++ b/src/lib/AbstractDataPluginModel.cpp
@@ -12,13 +12,13 @@
#include "AbstractDataPluginModel.h"
// Qt
-#include <QtCore/QUrl>
-#include <QtCore/QTimer>
-#include <QtCore/QPointF>
-#include <QtCore/QtAlgorithms>
-#include <QtCore/QVariant>
-#include <QtCore/QAbstractListModel>
-#include <QtCore/QMetaProperty>
+#include <QUrl>
+#include <QTimer>
+#include <QPointF>
+#include <QtAlgorithms>
+#include <QVariant>
+#include <QAbstractListModel>
+#include <QMetaProperty>
// Marble
#include "MarbleDebug.h"
diff --git a/src/lib/AbstractFloatItem.cpp b/src/lib/AbstractFloatItem.cpp
index 596c4b4..d465045 100644
--- a/src/lib/AbstractFloatItem.cpp
+++ b/src/lib/AbstractFloatItem.cpp
@@ -12,9 +12,9 @@
#include "AbstractFloatItem.h"
// Qt
-#include <QtGui/QMenu>
-#include <QtGui/QAction>
-#include <QtGui/QDialog>
+#include <QMenu>
+#include <QAction>
+#include <QDialog>
// Marble
#include "DialogConfigurationInterface.h"
diff --git a/src/lib/AbstractWorkerThread.cpp b/src/lib/AbstractWorkerThread.cpp
index bbac47c..57f138f 100644
--- a/src/lib/AbstractWorkerThread.cpp
+++ b/src/lib/AbstractWorkerThread.cpp
@@ -13,7 +13,7 @@
#include "MarbleDebug.h"
// Qt
-#include <QtCore/QMutex>
+#include <QMutex>
namespace Marble
{
diff --git a/src/lib/AutoNavigation.cpp b/src/lib/AutoNavigation.cpp
index f892d56..e7f3152 100644
--- a/src/lib/AutoNavigation.cpp
+++ b/src/lib/AutoNavigation.cpp
@@ -20,11 +20,11 @@
#include "ViewportParams.h"
#include "MarbleGlobal.h"
-#include <QtGui/QPixmap>
-#include <QtGui/QWidget>
-#include <QtCore/QRect>
-#include <QtCore/QPointF>
-#include <QtCore/QTimer>
+#include <QPixmap>
+#include <QWidget>
+#include <QRect>
+#include <QPointF>
+#include <QTimer>
#include <math.h>
namespace Marble {
diff --git a/src/lib/BookmarkManager.cpp b/src/lib/BookmarkManager.cpp
index 4fd4e8b..ed37681 100644
--- a/src/lib/BookmarkManager.cpp
+++ b/src/lib/BookmarkManager.cpp
@@ -21,7 +21,7 @@
#include "KmlElementDictionary.h"
#include "MarbleDebug.h"
#include "MarbleDirs.h"
-#include <QtCore/QFile>
+#include <QFile>
namespace Marble
{
diff --git a/src/lib/BookmarkManagerDialog.cpp b/src/lib/BookmarkManagerDialog.cpp
index 74d32b3..a67b099 100644
--- a/src/lib/BookmarkManagerDialog.cpp
+++ b/src/lib/BookmarkManagerDialog.cpp
@@ -30,12 +30,12 @@
#include "NewBookmarkFolderDialog.h"
#include "MarblePlacemarkModel.h"
-#include <QtCore/QPointer>
-#include <QtCore/QFile>
-#include <QtGui/QSortFilterProxyModel>
-#include <QtGui/QFileDialog>
-#include <QtGui/QMessageBox>
-#include <QtGui/QItemSelectionModel>
+#include <QPointer>
+#include <QFile>
+#include <QSortFilterProxyModel>
+#include <QFileDialog>
+#include <QMessageBox>
+#include <QItemSelectionModel>
namespace Marble {
diff --git a/src/lib/CacheStoragePolicy.cpp b/src/lib/CacheStoragePolicy.cpp
index f9055ca..21a3b2a 100644
--- a/src/lib/CacheStoragePolicy.cpp
+++ b/src/lib/CacheStoragePolicy.cpp
@@ -13,7 +13,7 @@
#include "CacheStoragePolicy.h"
// Qt
-#include <QtCore/QDir>
+#include <QDir>
using namespace Marble;
diff --git a/src/lib/CurrentLocationWidget.cpp b/src/lib/CurrentLocationWidget.cpp
index 0abeed2..e7da170 100644
--- a/src/lib/CurrentLocationWidget.cpp
+++ b/src/lib/CurrentLocationWidget.cpp
@@ -33,9 +33,9 @@ using namespace Marble;
// Ui
#include "ui_CurrentLocationWidget.h"
-#include <QtCore/QDateTime>
-#include <QtGui/QFileDialog>
-#include <QtGui/QMessageBox>
+#include <QDateTime>
+#include <QFileDialog>
+#include <QMessageBox>
namespace Marble
{
diff --git a/src/lib/DataMigration.cpp b/src/lib/DataMigration.cpp
index 1c7eb0c..ad21fa0 100644
--- a/src/lib/DataMigration.cpp
+++ b/src/lib/DataMigration.cpp
@@ -17,14 +17,14 @@
#include "ui_DataMigrationWidget.h"
// Qt
-#include <QtCore/QDebug>
-#include <QtCore/QDir>
-#include <QtCore/QDirIterator>
-#include <QtCore/QFileInfo>
-#include <QtCore/QPointer>
-#include <QtCore/QStack>
-#include <QtGui/QDialog>
-#include <QtGui/QProgressDialog>
+#include <QDebug>
+#include <QDir>
+#include <QDirIterator>
+#include <QFileInfo>
+#include <QPointer>
+#include <QStack>
+#include <QDialog>
+#include <QProgressDialog>
// std
#include <limits>
diff --git a/src/lib/DeferredFlag.cpp b/src/lib/DeferredFlag.cpp
index 3b92752..5a13566 100644
--- a/src/lib/DeferredFlag.cpp
+++ b/src/lib/DeferredFlag.cpp
@@ -11,11 +11,11 @@
#include "DeferredFlag.h"
-#include <QtGui/QColor>
-#include <QtGui/QPainter>
-#include <QtGui/QPainterPath>
-#include <QtGui/QPixmapCache>
-#include <QtSvg/QSvgRenderer>
+#include <QColor>
+#include <QPainter>
+#include <QPainterPath>
+#include <QPixmapCache>
+#include <QSvgRenderer>
using namespace Marble;
diff --git a/src/lib/DiscCache.cpp b/src/lib/DiscCache.cpp
index 2fcd9d5..23525f5 100644
--- a/src/lib/DiscCache.cpp
+++ b/src/lib/DiscCache.cpp
@@ -13,9 +13,9 @@
#include "DiscCache.h"
// Qt
-#include <QtCore/QtGlobal>
-#include <QtCore/QFile>
-#include <QtCore/QDirIterator>
+#include <QtGlobal>
+#include <QFile>
+#include <QDirIterator>
using namespace Marble;
diff --git a/src/lib/DownloadRegionDialog.cpp b/src/lib/DownloadRegionDialog.cpp
index 598f1d1..e1bfd5e 100644
--- a/src/lib/DownloadRegionDialog.cpp
+++ b/src/lib/DownloadRegionDialog.cpp
@@ -12,18 +12,18 @@
#include <cmath>
-#include <QtGui/QDialogButtonBox>
-#include <QtGui/QGroupBox>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QHideEvent>
-#include <QtGui/QLabel>
-#include <QtGui/QPushButton>
-#include <QtGui/QRadioButton>
-#include <QtGui/QShowEvent>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QSpinBox>
-#include <QtGui/QScrollArea>
-#include <QtCore/QSet>
+#include <QDialogButtonBox>
+#include <QGroupBox>
+#include <QHBoxLayout>
+#include <QHideEvent>
+#include <QLabel>
+#include <QPushButton>
+#include <QRadioButton>
+#include <QShowEvent>
+#include <QVBoxLayout>
+#include <QSpinBox>
+#include <QScrollArea>
+#include <QSet>
#include "GeoDataLatLonAltBox.h"
#include "MarbleDebug.h"
diff --git a/src/lib/EditBookmarkDialog.cpp b/src/lib/EditBookmarkDialog.cpp
index bfc7cdf..78f07e7 100644
--- a/src/lib/EditBookmarkDialog.cpp
+++ b/src/lib/EditBookmarkDialog.cpp
@@ -24,7 +24,7 @@
#include "MarbleWidget.h"
#include "NewBookmarkFolderDialog.h"
-#include <QtCore/QPointer>
+#include <QPointer>
namespace Marble {
diff --git a/src/lib/ElevationModel.cpp b/src/lib/ElevationModel.cpp
index 561cea1..3edef7f 100644
--- a/src/lib/ElevationModel.cpp
+++ b/src/lib/ElevationModel.cpp
@@ -22,8 +22,8 @@
#include "MapThemeManager.h"
#include "TileId.h"
-#include <QtGui/QLabel>
-#include <QtCore/qmath.h>
+#include <QLabel>
+#include <qmath.h>
namespace Marble
{
diff --git a/src/lib/EquirectScanlineTextureMapper.cpp \
b/src/lib/EquirectScanlineTextureMapper.cpp index 1a0a3a6..d9df5b2 100644
--- a/src/lib/EquirectScanlineTextureMapper.cpp
+++ b/src/lib/EquirectScanlineTextureMapper.cpp
@@ -17,7 +17,7 @@
#include <cmath>
// Qt
-#include <QtCore/QRunnable>
+#include <QRunnable>
// Marble
#include "GeoPainter.h"
diff --git a/src/lib/ExternalEditorDialog.cpp b/src/lib/ExternalEditorDialog.cpp
index 86d0f26..47a7c55 100644
--- a/src/lib/ExternalEditorDialog.cpp
+++ b/src/lib/ExternalEditorDialog.cpp
@@ -10,9 +10,9 @@
#include "ExternalEditorDialog.h"
-#include <QtCore/QProcessEnvironment>
-#include <QtCore/QFileInfo>
-#include <QtCore/QDir>
+#include <QProcessEnvironment>
+#include <QFileInfo>
+#include <QDir>
namespace Marble
{
diff --git a/src/lib/FileLoader.cpp b/src/lib/FileLoader.cpp
index 872f351..3c1d7bf 100644
--- a/src/lib/FileLoader.cpp
+++ b/src/lib/FileLoader.cpp
@@ -10,11 +10,11 @@
#include "FileLoader.h"
-#include <QtCore/QBuffer>
-#include <QtCore/QDataStream>
-#include <QtCore/QDateTime>
-#include <QtCore/QFile>
-#include <QtCore/QThread>
+#include <QBuffer>
+#include <QDataStream>
+#include <QDateTime>
+#include <QFile>
+#include <QThread>
#include "GeoDataParser.h"
#include "GeoDataDocument.h"
diff --git a/src/lib/FileManager.cpp b/src/lib/FileManager.cpp
index aae3c81..2ff4c6c 100644
--- a/src/lib/FileManager.cpp
+++ b/src/lib/FileManager.cpp
@@ -11,10 +11,10 @@
#include "FileManager.h"
-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
-#include <QtCore/QTime>
-#include <QtGui/QMessageBox>
+#include <QDir>
+#include <QFileInfo>
+#include <QTime>
+#include <QMessageBox>
#include "FileLoader.h"
#include "MarbleDebug.h"
diff --git a/src/lib/FileStoragePolicy.cpp b/src/lib/FileStoragePolicy.cpp
index ca22b11..5594954 100644
--- a/src/lib/FileStoragePolicy.cpp
+++ b/src/lib/FileStoragePolicy.cpp
@@ -13,10 +13,10 @@
#include "FileStoragePolicy.h"
// Qt
-#include <QtCore/QDir>
-#include <QtCore/QDirIterator>
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
+#include <QDir>
+#include <QDirIterator>
+#include <QFile>
+#include <QFileInfo>
// Marble
#include "MarbleDebug.h"
diff --git a/src/lib/FileStorageWatcher.cpp b/src/lib/FileStorageWatcher.cpp
index 7e97d10..8706e71 100644
--- a/src/lib/FileStorageWatcher.cpp
+++ b/src/lib/FileStorageWatcher.cpp
@@ -12,11 +12,11 @@
#include "FileStorageWatcher.h"
// Qt
-#include <QtCore/QDateTime>
-#include <QtCore/QDir>
-#include <QtCore/QDirIterator>
-#include <QtCore/QFileInfo>
-#include <QtCore/QTimer>
+#include <QDateTime>
+#include <QDir>
+#include <QDirIterator>
+#include <QFileInfo>
+#include <QTimer>
// Marble
#include "MarbleGlobal.h"
diff --git a/src/lib/FileViewWidget.cpp b/src/lib/FileViewWidget.cpp
index bbbc853..cd48730 100644
--- a/src/lib/FileViewWidget.cpp
+++ b/src/lib/FileViewWidget.cpp
@@ -12,7 +12,7 @@
#include "FileViewWidget.h"
// Qt
-#include <QtGui/QSortFilterProxyModel>
+#include <QSortFilterProxyModel>
// Marble
#include "GeoDataContainer.h"
diff --git a/src/lib/GeoDataTreeModel.cpp b/src/lib/GeoDataTreeModel.cpp
index 4cc73dd..c900bf5 100644
--- a/src/lib/GeoDataTreeModel.cpp
+++ b/src/lib/GeoDataTreeModel.cpp
@@ -13,11 +13,11 @@
#include "GeoDataTreeModel.h"
// Qt
-#include <QtCore/QModelIndex>
-#include <QtCore/QFile>
-#include <QtCore/QList>
-#include <QtGui/QPixmap>
-#include <QtGui/QItemSelectionModel>
+#include <QModelIndex>
+#include <QFile>
+#include <QList>
+#include <QPixmap>
+#include <QItemSelectionModel>
// Marble
#include "GeoDataObject.h"
diff --git a/src/lib/GeoGraphicsScene.cpp b/src/lib/GeoGraphicsScene.cpp
index 9e39568..f84c532 100644
--- a/src/lib/GeoGraphicsScene.cpp
+++ b/src/lib/GeoGraphicsScene.cpp
@@ -20,7 +20,7 @@
#include "TileId.h"
#include "TileCoordsPyramid.h"
#include "MarbleDebug.h"
-#include <QtCore/QMap>
+#include <QMap>
namespace Marble
{
diff --git a/src/lib/GeoPainter.cpp b/src/lib/GeoPainter.cpp
index fcf1369..4369a84 100644
--- a/src/lib/GeoPainter.cpp
+++ b/src/lib/GeoPainter.cpp
@@ -11,9 +11,9 @@
#include "GeoPainter.h"
#include "GeoPainter_p.h"
-#include <QtCore/QList>
-#include <QtGui/QPainterPath>
-#include <QtGui/QRegion>
+#include <QList>
+#include <QPainterPath>
+#include <QRegion>
#include "MarbleDebug.h"
diff --git a/src/lib/GeoPolygon.cpp b/src/lib/GeoPolygon.cpp
index ba9da66..4d15f00 100644
--- a/src/lib/GeoPolygon.cpp
+++ b/src/lib/GeoPolygon.cpp
@@ -17,9 +17,9 @@
#include <cmath>
using std::fabs;
-#include <QtCore/QFile>
-#include <QtCore/QDataStream>
-#include <QtCore/QTime>
+#include <QFile>
+#include <QDataStream>
+#include <QTime>
#ifdef Q_OS_UNIX
# include <unistd.h>
# include <sys/types.h>
diff --git a/src/lib/GoToDialog.cpp b/src/lib/GoToDialog.cpp
index 57b65de..003b055 100644
--- a/src/lib/GoToDialog.cpp
+++ b/src/lib/GoToDialog.cpp
@@ -24,10 +24,10 @@
#include "routing/RoutingManager.h"
#include "routing/RouteRequest.h"
-#include <QtCore/QAbstractListModel>
-#include <QtCore/QTimer>
-#include <QtGui/QPushButton>
-#include <QtGui/QPainter>
+#include <QAbstractListModel>
+#include <QTimer>
+#include <QPushButton>
+#include <QPainter>
namespace Marble
{
diff --git a/src/lib/HttpDownloadManager.cpp b/src/lib/HttpDownloadManager.cpp
index 327bcf3..29eef83 100644
--- a/src/lib/HttpDownloadManager.cpp
+++ b/src/lib/HttpDownloadManager.cpp
@@ -12,10 +12,10 @@
#include "HttpDownloadManager.h"
-#include <QtCore/QList>
-#include <QtCore/QMap>
-#include <QtCore/QTimer>
-#include <QtNetwork/QNetworkAccessManager>
+#include <QList>
+#include <QMap>
+#include <QTimer>
+#include <QNetworkAccessManager>
#include "DownloadPolicy.h"
#include "DownloadQueueSet.h"
diff --git a/src/lib/HttpJob.cpp b/src/lib/HttpJob.cpp
index 36f2150..4c38730 100644
--- a/src/lib/HttpJob.cpp
+++ b/src/lib/HttpJob.cpp
@@ -16,8 +16,8 @@
#include "MarbleDebug.h"
#include "TinyWebBrowser.h"
-#include <QtNetwork/QNetworkAccessManager>
-#include <QtNetwork/QNetworkReply>
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
using namespace Marble;
diff --git a/src/lib/LatLonEdit.cpp b/src/lib/LatLonEdit.cpp
index b568298..36cac59 100644
--- a/src/lib/LatLonEdit.cpp
+++ b/src/lib/LatLonEdit.cpp
@@ -12,7 +12,7 @@
#include "LatLonEdit.h"
#include "ui_LatLonEdit.h"
-#include <QtGui/QWidget>
+#include <QWidget>
#include "MarbleDebug.h"
#include "MarbleGlobal.h"
diff --git a/src/lib/MapThemeDownloadDialog.cpp b/src/lib/MapThemeDownloadDialog.cpp
index 50e9243..a52b272 100644
--- a/src/lib/MapThemeDownloadDialog.cpp
+++ b/src/lib/MapThemeDownloadDialog.cpp
@@ -16,10 +16,10 @@
#include "NewstuffModel.h"
#include "MarbleWidget.h"
-#include <QtGui/QPainter>
-#include <QtGui/QTextDocument>
-#include <QtGui/QAbstractTextDocumentLayout>
-#include <QtGui/QStyledItemDelegate>
+#include <QPainter>
+#include <QTextDocument>
+#include <QAbstractTextDocumentLayout>
+#include <QStyledItemDelegate>
namespace Marble
{
diff --git a/src/lib/MapThemeManager.cpp b/src/lib/MapThemeManager.cpp
index 7812ad0..722e93b 100644
--- a/src/lib/MapThemeManager.cpp
+++ b/src/lib/MapThemeManager.cpp
@@ -14,14 +14,14 @@
#include "MapThemeManager.h"
// Qt
-#include <QtCore/QDir>
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
-#include <QtCore/QFileSystemWatcher>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QTimer>
-#include <QtGui/QStandardItemModel>
+#include <QDir>
+#include <QFile>
+#include <QFileInfo>
+#include <QFileSystemWatcher>
+#include <QString>
+#include <QStringList>
+#include <QTimer>
+#include <QStandardItemModel>
// Local dir
#include "GeoSceneDocument.h"
diff --git a/src/lib/MapThemeSortFilterProxyModel.cpp \
b/src/lib/MapThemeSortFilterProxyModel.cpp index 436a5cf..23a9e97 100644
--- a/src/lib/MapThemeSortFilterProxyModel.cpp
+++ b/src/lib/MapThemeSortFilterProxyModel.cpp
@@ -11,10 +11,10 @@
#include "MapThemeSortFilterProxyModel.h"
-#include <QtCore/QString>
-#include <QtCore/QModelIndex>
-#include <QtCore/QDateTime>
-#include <QtCore/QSettings>
+#include <QString>
+#include <QModelIndex>
+#include <QDateTime>
+#include <QSettings>
/* TRANSLATOR Marble::MapThemeSortFilterProxyModel */
diff --git a/src/lib/MapViewWidget.cpp b/src/lib/MapViewWidget.cpp
index b7c0b34..ebe0041 100644
--- a/src/lib/MapViewWidget.cpp
+++ b/src/lib/MapViewWidget.cpp
@@ -28,17 +28,17 @@
// Qt
#include <QResizeEvent>
-#include <QtCore/QFileInfo>
-#include <QtCore/QSettings>
-#include <QtGui/QMenu>
-#include <QtGui/QMessageBox>
-#include <QtGui/QStandardItemModel>
-#include <QtGui/QGridLayout>
-#include <QtGui/QPainter>
+#include <QFileInfo>
+#include <QSettings>
+#include <QMenu>
+#include <QMessageBox>
+#include <QStandardItemModel>
+#include <QGridLayout>
+#include <QPainter>
#include <QToolBar>
#include <QToolButton>
-#include <QtGui/QTextDocument>
-#include <QtGui/QAbstractTextDocumentLayout>
+#include <QTextDocument>
+#include <QAbstractTextDocumentLayout>
using namespace Marble;
// Ui
diff --git a/src/lib/MapWizard.cpp b/src/lib/MapWizard.cpp
index 89a234b..1e17ebb 100644
--- a/src/lib/MapWizard.cpp
+++ b/src/lib/MapWizard.cpp
@@ -34,23 +34,23 @@
#include "MarbleWidget.h"
#include "MarbleNavigator.h"
-#include <QtCore/QBuffer>
-#include <QtCore/QDir>
-#include <QtCore/QFile>
-#include <QtCore/QProcess>
-#include <QtCore/QSharedPointer>
-#include <QtCore/QTimer>
-#include <QtCore/QTemporaryFile>
-#include <QtGui/QPixmap>
-#include <QtGui/QMessageBox>
-#include <QtGui/QFileDialog>
-#include <QtGui/QImageReader>
-#include <QtGui/QDialogButtonBox>
-#include <QtNetwork/QNetworkAccessManager>
-#include <QtNetwork/QNetworkReply>
-#include <QtNetwork/QNetworkRequest>
-#include <QtXml/QDomElement>
-#include <QtXml/QXmlStreamWriter>
+#include <QBuffer>
+#include <QDir>
+#include <QFile>
+#include <QProcess>
+#include <QSharedPointer>
+#include <QTimer>
+#include <QTemporaryFile>
+#include <QPixmap>
+#include <QMessageBox>
+#include <QFileDialog>
+#include <QImageReader>
+#include <QDialogButtonBox>
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
+#include <QNetworkRequest>
+#include <QDomElement>
+#include <QXmlStreamWriter>
namespace Marble
{
diff --git a/src/lib/MarbleAboutDialog.cpp b/src/lib/MarbleAboutDialog.cpp
index b9af5c1..de95fdb 100644
--- a/src/lib/MarbleAboutDialog.cpp
+++ b/src/lib/MarbleAboutDialog.cpp
@@ -25,11 +25,11 @@
#include "MarbleAboutDialog.h"
#include "ui_MarbleAboutDialog.h"
-#include <QtCore/QFile>
-#include <QtGui/QTextFrame>
-#include <QtGui/QTabWidget>
-#include <QtCore/QTextStream>
-#include <QtGui/QPixmap>
+#include <QFile>
+#include <QTextFrame>
+#include <QTabWidget>
+#include <QTextStream>
+#include <QPixmap>
#include "MarbleGlobal.h"
#include "MarbleDirs.h"
diff --git a/src/lib/MarbleCacheSettingsWidget.cpp \
b/src/lib/MarbleCacheSettingsWidget.cpp index 35185fc..26538e4 100644
--- a/src/lib/MarbleCacheSettingsWidget.cpp
+++ b/src/lib/MarbleCacheSettingsWidget.cpp
@@ -11,7 +11,7 @@
#include "MarbleCacheSettingsWidget.h"
-#include <QtGui/QPushButton>
+#include <QPushButton>
using namespace Marble;
diff --git a/src/lib/MarbleClock.cpp b/src/lib/MarbleClock.cpp
index cc643d9..3e22cee 100644
--- a/src/lib/MarbleClock.cpp
+++ b/src/lib/MarbleClock.cpp
@@ -12,7 +12,7 @@
#include "MarbleClock.h"
#include "MarbleDebug.h"
-#include <QtCore/QTimer>
+#include <QTimer>
namespace Marble {
diff --git a/src/lib/MarbleDirs.cpp b/src/lib/MarbleDirs.cpp
index 7ee881d..da2bae5 100644
--- a/src/lib/MarbleDirs.cpp
+++ b/src/lib/MarbleDirs.cpp
@@ -13,11 +13,11 @@
#include "MarbleDirs.h"
#include "MarbleDebug.h"
-#include <QtCore/QDir>
-#include <QtCore/QFile>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtGui/QApplication>
+#include <QDir>
+#include <QFile>
+#include <QString>
+#include <QStringList>
+#include <QApplication>
#include <stdlib.h>
diff --git a/src/lib/MarbleLegendBrowser.cpp b/src/lib/MarbleLegendBrowser.cpp
index f2c0c4c..65915e8 100644
--- a/src/lib/MarbleLegendBrowser.cpp
+++ b/src/lib/MarbleLegendBrowser.cpp
@@ -13,21 +13,21 @@
#include "MarbleLegendBrowser.h"
-#include <QtCore/QTime>
-#include <QtCore/QUrl>
-#include <QtGui/QDesktopServices>
-#include <QtCore/QEvent>
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
-#include <QtGui/QPainter>
-#include <QtGui/QTextFrame>
-#include <QtGui/QScrollBar>
-#include <QtGui/QStyle>
-#include <QtGui/QStyleOptionButton>
-#include <QtGui/QDesktopServices>
-#include <QtCore/QRegExp>
-#include <QtWebKit/QWebFrame>
-#include <QtWebKit/QWebElement>
+#include <QTime>
+#include <QUrl>
+#include <QDesktopServices>
+#include <QEvent>
+#include <QFile>
+#include <QFileInfo>
+#include <QPainter>
+#include <QTextFrame>
+#include <QScrollBar>
+#include <QStyle>
+#include <QStyleOptionButton>
+#include <QDesktopServices>
+#include <QRegExp>
+#include <QWebFrame>
+#include <QWebElement>
#include <QTextDocument>
#include "GeoSceneDocument.h"
diff --git a/src/lib/MarbleLineEdit.cpp b/src/lib/MarbleLineEdit.cpp
index 1f1a4c7..79d9af0 100644
--- a/src/lib/MarbleLineEdit.cpp
+++ b/src/lib/MarbleLineEdit.cpp
@@ -15,13 +15,13 @@
#include "MarbleLineEdit.h"
#include "MarbleGlobal.h"
-#include <QtGui/QApplication>
-#include <QtGui/QClipboard>
-#include <QtGui/QLabel>
-#include <QtGui/QStyle>
-#include <QtGui/QMouseEvent>
-#include <QtGui/QPainter>
-#include <QtCore/QTimer>
+#include <QApplication>
+#include <QClipboard>
+#include <QLabel>
+#include <QStyle>
+#include <QMouseEvent>
+#include <QPainter>
+#include <QTimer>
namespace Marble
{
diff --git a/src/lib/MarbleLocale.cpp b/src/lib/MarbleLocale.cpp
index 03253c1..8aca097 100644
--- a/src/lib/MarbleLocale.cpp
+++ b/src/lib/MarbleLocale.cpp
@@ -12,7 +12,7 @@
#include "MarbleLocale_p.h"
// Qt
-#include <QtCore/QLocale>
+#include <QLocale>
namespace Marble
diff --git a/src/lib/MarbleMap.cpp b/src/lib/MarbleMap.cpp
index 102ed0d..8839ad3 100644
--- a/src/lib/MarbleMap.cpp
+++ b/src/lib/MarbleMap.cpp
@@ -20,15 +20,15 @@
#include <cmath>
// Qt
-#include <QtCore/QAbstractItemModel>
-#include <QtCore/QTime>
-#include <QtCore/QTimer>
-#include <QtGui/QItemSelectionModel>
-#include <QtGui/QSizePolicy>
-#include <QtGui/QRegion>
+#include <QAbstractItemModel>
+#include <QTime>
+#include <QTimer>
+#include <QItemSelectionModel>
+#include <QSizePolicy>
+#include <QRegion>
#ifdef MARBLE_DBUS
-#include <QtDBus/QDBusConnection>
+#include <QDBusConnection>
#endif
// Marble
diff --git a/src/lib/MarbleModel.cpp b/src/lib/MarbleModel.cpp
index 3c44f9d..96d1b0b 100644
--- a/src/lib/MarbleModel.cpp
+++ b/src/lib/MarbleModel.cpp
@@ -16,18 +16,18 @@
#include <cmath>
-#include <QtCore/QAtomicInt>
-#include <QtCore/QPointer>
-#include <QtCore/QTime>
-#include <QtCore/QTimer>
-#include <QtCore/QAbstractItemModel>
-#include <QtCore/QSet>
-#include <QtGui/QItemSelectionModel>
-#include <QtGui/QSortFilterProxyModel>
+#include <QAtomicInt>
+#include <QPointer>
+#include <QTime>
+#include <QTimer>
+#include <QAbstractItemModel>
+#include <QSet>
+#include <QItemSelectionModel>
+#include <QSortFilterProxyModel>
#if (QT_VERSION >= 0x040700 && QT_VERSION < 0x040800)
// See comment below why this is needed
-#include <QtNetwork/QNetworkConfigurationManager>
+#include <QNetworkConfigurationManager>
#endif
#include "kdescendantsproxymodel.h"
diff --git a/src/lib/MarbleNavigator.cpp b/src/lib/MarbleNavigator.cpp
index 54b3611..cc80fd3 100644
--- a/src/lib/MarbleNavigator.cpp
+++ b/src/lib/MarbleNavigator.cpp
@@ -12,9 +12,9 @@
#include "MarbleNavigator.h"
-#include <QtCore/QtAlgorithms>
-#include <QtCore/QTimer>
-#include <QtGui/QStringListModel>
+#include <QtAlgorithms>
+#include <QTimer>
+#include <QStringListModel>
#include "MarbleDebug.h"
diff --git a/src/lib/MarblePhysics.cpp b/src/lib/MarblePhysics.cpp
index 704929a..9c4b112 100644
--- a/src/lib/MarblePhysics.cpp
+++ b/src/lib/MarblePhysics.cpp
@@ -16,7 +16,7 @@
#include "GeoDataLineString.h"
#include "ViewportParams.h"
-#include <QtCore/QTimeLine>
+#include <QTimeLine>
namespace Marble
{
diff --git a/src/lib/MarblePlacemarkModel.cpp b/src/lib/MarblePlacemarkModel.cpp
index 3057078..19b0a7e 100644
--- a/src/lib/MarblePlacemarkModel.cpp
+++ b/src/lib/MarblePlacemarkModel.cpp
@@ -15,7 +15,7 @@
#include "MarblePlacemarkModel_P.h"
// Qt
-#include <QtCore/QTime>
+#include <QTime>
// Marble
#include "MarbleDebug.h"
diff --git a/src/lib/MarblePluginSettingsWidget.cpp \
b/src/lib/MarblePluginSettingsWidget.cpp index 25e60c9..03a4c34 100644
--- a/src/lib/MarblePluginSettingsWidget.cpp
+++ b/src/lib/MarblePluginSettingsWidget.cpp
@@ -13,8 +13,8 @@
#include "ui_MarblePluginSettingsWidget.h"
// Qt
-#include <QtCore/QPointer>
-#include <QtGui/QDialog>
+#include <QPointer>
+#include <QDialog>
// Marble
#include "DialogConfigurationInterface.h"
diff --git a/src/lib/MarbleRunnerManager.cpp b/src/lib/MarbleRunnerManager.cpp
index d42a203..bd23d00 100644
--- a/src/lib/MarbleRunnerManager.cpp
+++ b/src/lib/MarbleRunnerManager.cpp
@@ -27,12 +27,12 @@
#include "routing/RouteRequest.h"
#include "routing/RoutingProfilesModel.h"
-#include <QtCore/QObject>
-#include <QtCore/QString>
-#include <QtCore/QVector>
-#include <QtCore/QThreadPool>
-#include <QtCore/QTimer>
-#include <QtCore/QFileInfo>
+#include <QObject>
+#include <QString>
+#include <QVector>
+#include <QThreadPool>
+#include <QTimer>
+#include <QFileInfo>
namespace Marble
{
diff --git a/src/lib/MarbleWidget.cpp b/src/lib/MarbleWidget.cpp
index efb8dca..026d996 100644
--- a/src/lib/MarbleWidget.cpp
+++ b/src/lib/MarbleWidget.cpp
@@ -13,19 +13,19 @@
#include "MarbleWidget.h"
-#include <QtCore/qmath.h>
-#include <QtCore/QAbstractItemModel>
-#include <QtCore/QHash>
-#include <QtCore/QSettings>
-#include <QtCore/QTime>
-#include <QtGui/QItemSelectionModel>
-#include <QtGui/QPaintEvent>
-#include <QtGui/QRegion>
-#include <QtGui/QSizePolicy>
-#include <QtNetwork/QNetworkProxy>
+#include <qmath.h>
+#include <QAbstractItemModel>
+#include <QHash>
+#include <QSettings>
+#include <QTime>
+#include <QItemSelectionModel>
+#include <QPaintEvent>
+#include <QRegion>
+#include <QSizePolicy>
+#include <QNetworkProxy>
#ifdef MARBLE_DBUS
-#include <QtDBus/QDBusConnection>
+#include <QDBusConnection>
#endif
#include "DataMigration.h"
diff --git a/src/lib/MarbleWidgetInputHandler.cpp \
b/src/lib/MarbleWidgetInputHandler.cpp index 310bbce..5d9628f 100644
--- a/src/lib/MarbleWidgetInputHandler.cpp
+++ b/src/lib/MarbleWidgetInputHandler.cpp
@@ -13,20 +13,20 @@
#include <cmath>
-#include <QtCore/QPoint>
-#include <QtCore/QPointer>
-#include <QtCore/QTime>
-#include <QtCore/QTimer>
-#include <QtGui/QAction>
-#include <QtGui/QCursor>
-#include <QtGui/QMouseEvent>
-#include <QtGui/QPixmap>
-#include <QtGui/QRubberBand>
-#include <QtGui/QToolTip>
+#include <QPoint>
+#include <QPointer>
+#include <QTime>
+#include <QTimer>
+#include <QAction>
+#include <QCursor>
+#include <QMouseEvent>
+#include <QPixmap>
+#include <QRubberBand>
+#include <QToolTip>
#if QT_VERSION >= 0x40600
- #include <QtGui/QGestureEvent>
- #include <QtGui/QPinchGesture>
+ #include <QGestureEvent>
+ #include <QPinchGesture>
#endif
#include "kineticmodel.h"
diff --git a/src/lib/MarbleWidgetPopupMenu.cpp b/src/lib/MarbleWidgetPopupMenu.cpp
index ba27f36..7dd48cb 100644
--- a/src/lib/MarbleWidgetPopupMenu.cpp
+++ b/src/lib/MarbleWidgetPopupMenu.cpp
@@ -38,12 +38,12 @@
// Qt
#include <QApplication>
-#include <QtCore/QMimeData>
-#include <QtCore/QPointer>
-#include <QtGui/QAction>
-#include <QtGui/QClipboard>
-#include <QtGui/QMenu>
-#include <QtGui/QMessageBox>
+#include <QMimeData>
+#include <QPointer>
+#include <QAction>
+#include <QClipboard>
+#include <QMenu>
+#include <QMessageBox>
using namespace Marble;
/* TRANSLATOR Marble::MarbleWidgetPopupMenu */
diff --git a/src/lib/MercatorScanlineTextureMapper.cpp \
b/src/lib/MercatorScanlineTextureMapper.cpp index e0c71c2..62348fb 100644
--- a/src/lib/MercatorScanlineTextureMapper.cpp
+++ b/src/lib/MercatorScanlineTextureMapper.cpp
@@ -18,7 +18,7 @@
#include <cmath>
// Qt
-#include <QtCore/QRunnable>
+#include <QRunnable>
// Marble
#include "GeoPainter.h"
diff --git a/src/lib/MergedLayerDecorator.cpp b/src/lib/MergedLayerDecorator.cpp
index 6363d8e..b03cca1 100644
--- a/src/lib/MergedLayerDecorator.cpp
+++ b/src/lib/MergedLayerDecorator.cpp
@@ -39,9 +39,9 @@
#include "TileLoader.h"
-#include <QtCore/QMutexLocker>
-#include <QtCore/QPointer>
-#include <QtGui/QPainter>
+#include <QMutexLocker>
+#include <QPointer>
+#include <QPainter>
using namespace Marble;
diff --git a/src/lib/NavigationWidget.cpp b/src/lib/NavigationWidget.cpp
index e327c6d..b4285e9 100644
--- a/src/lib/NavigationWidget.cpp
+++ b/src/lib/NavigationWidget.cpp
@@ -28,9 +28,9 @@
#include "ViewportParams.h"
// Qt
-#include <QtCore/QTime>
-#include <QtCore/QTimer>
-#include <QtGui/QSortFilterProxyModel>
+#include <QTime>
+#include <QTimer>
+#include <QSortFilterProxyModel>
using namespace Marble;
diff --git a/src/lib/NewBookmarkFolderDialog.cpp \
b/src/lib/NewBookmarkFolderDialog.cpp index 8a346bc..cfcda4d 100644
--- a/src/lib/NewBookmarkFolderDialog.cpp
+++ b/src/lib/NewBookmarkFolderDialog.cpp
@@ -13,7 +13,7 @@
#include "NewBookmarkFolderDialog.h"
#include "MarbleDebug.h"
-#include <QtGui/QLineEdit>
+#include <QLineEdit>
namespace Marble {
diff --git a/src/lib/NewstuffModel.cpp b/src/lib/NewstuffModel.cpp
index b7a2025..a3b2bf2 100644
--- a/src/lib/NewstuffModel.cpp
+++ b/src/lib/NewstuffModel.cpp
@@ -13,20 +13,20 @@
#include "MarbleDebug.h"
#include "MarbleDirs.h"
-#include <QtCore/QUrl>
-#include <QtCore/QVector>
-#include <QtCore/QTemporaryFile>
-#include <QtCore/QDir>
-#include <QtCore/QFuture>
-#include <QtCore/QPair>
-#include <QtCore/QFutureWatcher>
-#include <QtCore/QtConcurrentRun>
-#include <QtCore/QProcessEnvironment>
-#include <QtCore/QMutexLocker>
-#include <QtGui/QIcon>
-#include <QtNetwork/QNetworkAccessManager>
-#include <QtNetwork/QNetworkReply>
-#include <QtXml/QDomDocument>
+#include <QUrl>
+#include <QVector>
+#include <QTemporaryFile>
+#include <QDir>
+#include <QFuture>
+#include <QPair>
+#include <QFutureWatcher>
+#include <QtConcurrentRun>
+#include <QProcessEnvironment>
+#include <QMutexLocker>
+#include <QIcon>
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
+#include <QDomDocument>
namespace Marble
{
diff --git a/src/lib/PlacemarkLayout.cpp b/src/lib/PlacemarkLayout.cpp
index 7baffc9..491aeb6 100644
--- a/src/lib/PlacemarkLayout.cpp
+++ b/src/lib/PlacemarkLayout.cpp
@@ -12,15 +12,15 @@
#include "PlacemarkLayout.h"
-#include <QtCore/QAbstractItemModel>
-#include <QtCore/QList>
-#include <QtCore/QPoint>
-#include <QtCore/QVector>
-#include <QtCore/QVectorIterator>
-#include <QtGui/QFont>
-#include <QtGui/QFontMetrics>
-#include <QtGui/QItemSelectionModel>
-#include <QtCore/qmath.h>
+#include <QAbstractItemModel>
+#include <QList>
+#include <QPoint>
+#include <QVector>
+#include <QVectorIterator>
+#include <QFont>
+#include <QFontMetrics>
+#include <QItemSelectionModel>
+#include <qmath.h>
#include "GeoDataPlacemark.h"
#include "GeoDataStyle.h"
diff --git a/src/lib/Planet.cpp b/src/lib/Planet.cpp
index 812e8f9..dbcfc0a 100644
--- a/src/lib/Planet.cpp
+++ b/src/lib/Planet.cpp
@@ -10,9 +10,9 @@
//
#include "Planet.h"
-#include <QtCore/QString>
-#include <QtCore/QHash>
-#include <QtCore/QObject>
+#include <QString>
+#include <QHash>
+#include <QObject>
#include "MarbleDebug.h"
#include "MarbleGlobal.h"
diff --git a/src/lib/PluginAboutDialog.cpp b/src/lib/PluginAboutDialog.cpp
index 832d755..8649f4b 100644
--- a/src/lib/PluginAboutDialog.cpp
+++ b/src/lib/PluginAboutDialog.cpp
@@ -16,7 +16,7 @@
#include "ui_MarbleAboutDialog.h"
// Qt
-#include <QtCore/QTextStream>
+#include <QTextStream>
namespace Marble
{
diff --git a/src/lib/PluginItemDelegate.cpp b/src/lib/PluginItemDelegate.cpp
index 9efdeb5..31cb8ab 100644
--- a/src/lib/PluginItemDelegate.cpp
+++ b/src/lib/PluginItemDelegate.cpp
@@ -16,15 +16,15 @@
#include "MarbleDebug.h"
// Qt
-#include <QtCore/QEvent>
-#include <QtCore/QSize>
-#include <QtCore/QVariant>
-#include <QtGui/QAbstractItemView>
-#include <QtGui/QMouseEvent>
-#include <QtGui/QStandardItemModel>
-#include <QtGui/QApplication>
-#include <QtGui/QPainter>
-#include <QtGui/QStandardItem>
+#include <QEvent>
+#include <QSize>
+#include <QVariant>
+#include <QAbstractItemView>
+#include <QMouseEvent>
+#include <QStandardItemModel>
+#include <QApplication>
+#include <QPainter>
+#include <QStandardItem>
using namespace Marble;
/* TRANSLATOR Marble::PluginItemDelegate */
diff --git a/src/lib/PluginManager.cpp b/src/lib/PluginManager.cpp
index c707463..e46d8b9 100644
--- a/src/lib/PluginManager.cpp
+++ b/src/lib/PluginManager.cpp
@@ -14,9 +14,9 @@
#include "PluginManager.h"
// Qt
-#include <QtCore/QList>
-#include <QtCore/QPluginLoader>
-#include <QtCore/QTime>
+#include <QList>
+#include <QPluginLoader>
+#include <QTime>
// Local dir
#include "MarbleDirs.h"
diff --git a/src/lib/PopupItem.cpp b/src/lib/PopupItem.cpp
index 2a638cd..c07e083 100644
--- a/src/lib/PopupItem.cpp
+++ b/src/lib/PopupItem.cpp
@@ -15,17 +15,17 @@
#include "MarbleWidget.h"
#include "MarbleWebView.h"
-#include <QtCore/QPointer>
-#include <QtWebKit/QWebView>
-#include <QtWebKit/QWebHistory>
-#include <QtGui/QPrinter>
-#include <QtGui/QPrintDialog>
-#include <QtGui/QMouseEvent>
-#include <QtGui/QApplication>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QLabel>
-#include <QtGui/QPushButton>
-#include <QtGui/QPixmapCache>
+#include <QPointer>
+#include <QWebView>
+#include <QWebHistory>
+#include <QPrinter>
+#include <QPrintDialog>
+#include <QMouseEvent>
+#include <QApplication>
+#include <QVBoxLayout>
+#include <QLabel>
+#include <QPushButton>
+#include <QPixmapCache>
#include <QMenu>
#include <QKeyEvent>
#include <QClipboard>
diff --git a/src/lib/PositionTracking.cpp b/src/lib/PositionTracking.cpp
index 6b2c78d..0141668 100644
--- a/src/lib/PositionTracking.cpp
+++ b/src/lib/PositionTracking.cpp
@@ -29,7 +29,7 @@
#include "MarbleDirs.h"
#include "PositionProviderPlugin.h"
-#include <QtCore/QFile>
+#include <QFile>
namespace Marble
{
diff --git a/src/lib/Projections/AbstractProjection.cpp \
b/src/lib/Projections/AbstractProjection.cpp index bcbf838..ffc1c37 100644
--- a/src/lib/Projections/AbstractProjection.cpp
+++ b/src/lib/Projections/AbstractProjection.cpp
@@ -16,7 +16,7 @@
#include "AbstractProjection_p.h"
#include "MarbleDebug.h"
-#include <QtGui/QRegion>
+#include <QRegion>
// Marble
#include "GeoDataLineString.h"
diff --git a/src/lib/QtMarbleConfigDialog.cpp b/src/lib/QtMarbleConfigDialog.cpp
index d12a299..79f05cf 100644
--- a/src/lib/QtMarbleConfigDialog.cpp
+++ b/src/lib/QtMarbleConfigDialog.cpp
@@ -17,17 +17,17 @@
#include "ui_MarbleTimeSettingsWidget.h"
// Qt
-#include <QtCore/QList>
-#include <QtCore/QSettings>
-#include <QtNetwork/QNetworkProxy>
-#include <QtGui/QApplication>
-#include <QtGui/QDialogButtonBox>
-#include <QtGui/QMessageBox>
-#include <QtGui/QStandardItem>
-#include <QtGui/QTabWidget>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QWidget>
-#include <QtCore/QDateTime>
+#include <QList>
+#include <QSettings>
+#include <QNetworkProxy>
+#include <QApplication>
+#include <QDialogButtonBox>
+#include <QMessageBox>
+#include <QStandardItem>
+#include <QTabWidget>
+#include <QVBoxLayout>
+#include <QWidget>
+#include <QDateTime>
// Marble
#include "MarbleGlobal.h"
diff --git a/src/lib/Quaternion.cpp b/src/lib/Quaternion.cpp
index d38bdcd..0679af8 100644
--- a/src/lib/Quaternion.cpp
+++ b/src/lib/Quaternion.cpp
@@ -15,8 +15,8 @@
#include <cmath>
using namespace std;
-#include <QtCore/QString>
-#include <QtCore/QDebug>
+#include <QString>
+#include <QDebug>
using namespace Marble;
diff --git a/src/lib/RenderPlugin.cpp b/src/lib/RenderPlugin.cpp
index b9b95c9..a51b27f 100644
--- a/src/lib/RenderPlugin.cpp
+++ b/src/lib/RenderPlugin.cpp
@@ -21,8 +21,8 @@
#include "RenderPluginModel.h"
// Qt
-#include <QtGui/QAction>
-#include <QtGui/QStandardItem>
+#include <QAction>
+#include <QStandardItem>
namespace Marble
diff --git a/src/lib/RoutingRunner.cpp b/src/lib/RoutingRunner.cpp
index 8609630..7f929b8 100644
--- a/src/lib/RoutingRunner.cpp
+++ b/src/lib/RoutingRunner.cpp
@@ -11,7 +11,7 @@
#include "GeoDataPlacemark.h"
-#include <QtCore/QString>
+#include <QString>
namespace Marble
{
diff --git a/src/lib/RunnerTask.cpp b/src/lib/RunnerTask.cpp
index 9b0778f..18b2434 100644
--- a/src/lib/RunnerTask.cpp
+++ b/src/lib/RunnerTask.cpp
@@ -19,7 +19,7 @@
#include "RoutingRunner.h"
#include "routing/RouteRequest.h"
-#include <QtCore/QTimer>
+#include <QTimer>
namespace Marble
{
diff --git a/src/lib/ScanlineTextureMapperContext.cpp \
b/src/lib/ScanlineTextureMapperContext.cpp index ff3197b..456c660 100644
--- a/src/lib/ScanlineTextureMapperContext.cpp
+++ b/src/lib/ScanlineTextureMapperContext.cpp
@@ -11,7 +11,7 @@
#include "ScanlineTextureMapperContext.h"
-#include <QtGui/QImage>
+#include <QImage>
#include "MarbleDebug.h"
#include "StackedTile.h"
diff --git a/src/lib/SearchInputWidget.cpp b/src/lib/SearchInputWidget.cpp
index d5779d7..c2e9426 100644
--- a/src/lib/SearchInputWidget.cpp
+++ b/src/lib/SearchInputWidget.cpp
@@ -13,8 +13,8 @@
#include "MarblePlacemarkModel.h"
-#include <QtGui/QCompleter>
-#include <QtGui/QMenu>
+#include <QCompleter>
+#include <QMenu>
namespace Marble {
diff --git a/src/lib/SearchWidget.cpp b/src/lib/SearchWidget.cpp
index c2d1066..c77a38d 100644
--- a/src/lib/SearchWidget.cpp
+++ b/src/lib/SearchWidget.cpp
@@ -18,8 +18,8 @@
#include "ViewportParams.h"
#include "MarbleDebug.h"
-#include <QtGui/QListView>
-#include <QtGui/QVBoxLayout>
+#include <QListView>
+#include <QVBoxLayout>
namespace Marble {
diff --git a/src/lib/SphericalScanlineTextureMapper.cpp \
b/src/lib/SphericalScanlineTextureMapper.cpp index 0bfe09c..6d665ae 100644
--- a/src/lib/SphericalScanlineTextureMapper.cpp
+++ b/src/lib/SphericalScanlineTextureMapper.cpp
@@ -14,7 +14,7 @@
#include <cmath>
-#include <QtCore/QRunnable>
+#include <QRunnable>
#include "MarbleGlobal.h"
#include "GeoPainter.h"
diff --git a/src/lib/StackedTileLoader.cpp b/src/lib/StackedTileLoader.cpp
index eb90911..fc5ec9c 100644
--- a/src/lib/StackedTileLoader.cpp
+++ b/src/lib/StackedTileLoader.cpp
@@ -32,10 +32,10 @@
#include "TileLoaderHelper.h"
#include "MarbleGlobal.h"
-#include <QtCore/QCache>
-#include <QtCore/QHash>
-#include <QtCore/QReadWriteLock>
-#include <QtGui/QImage>
+#include <QCache>
+#include <QHash>
+#include <QReadWriteLock>
+#include <QImage>
namespace Marble
diff --git a/src/lib/SunControlWidget.cpp b/src/lib/SunControlWidget.cpp
index 1546214..b16cd9d 100644
--- a/src/lib/SunControlWidget.cpp
+++ b/src/lib/SunControlWidget.cpp
@@ -16,7 +16,7 @@
#include "ui_SunControlWidget.h"
// Qt
-#include <QtGui/QShowEvent>
+#include <QShowEvent>
// Marble
#include "MarbleDebug.h"
diff --git a/src/lib/TextureColorizer.cpp b/src/lib/TextureColorizer.cpp
index ea933a4..ce2fbcf 100644
--- a/src/lib/TextureColorizer.cpp
+++ b/src/lib/TextureColorizer.cpp
@@ -13,15 +13,15 @@
#include "TextureColorizer.h"
-#include <QtCore/qmath.h>
-#include <QtCore/QFile>
-#include <QtCore/QSharedPointer>
-#include <QtCore/QString>
-#include <QtCore/QVector>
-#include <QtCore/QTime>
-#include <QtGui/QColor>
-#include <QtGui/QImage>
-#include <QtGui/QPainter>
+#include <qmath.h>
+#include <QFile>
+#include <QSharedPointer>
+#include <QString>
+#include <QVector>
+#include <QTime>
+#include <QColor>
+#include <QImage>
+#include <QPainter>
#include "MarbleGlobal.h"
#include "GeoPainter.h"
diff --git a/src/lib/TextureTile.cpp b/src/lib/TextureTile.cpp
index 19e3b66..1a384f6 100644
--- a/src/lib/TextureTile.cpp
+++ b/src/lib/TextureTile.cpp
@@ -22,7 +22,7 @@ License along with this library. If not, see \
<http://www.gnu.org/licenses/>.
#include <limits>
-#include <QtCore/QString>
+#include <QString>
namespace Marble
{
diff --git a/src/lib/Tile.cpp b/src/lib/Tile.cpp
index ab18545..41a4319 100644
--- a/src/lib/Tile.cpp
+++ b/src/lib/Tile.cpp
@@ -21,7 +21,7 @@
#include <limits>
-#include <QtCore/QString>
+#include <QString>
namespace Marble
{
diff --git a/src/lib/TileCreator.cpp b/src/lib/TileCreator.cpp
index d7f381b..920a47c 100644
--- a/src/lib/TileCreator.cpp
+++ b/src/lib/TileCreator.cpp
@@ -14,14 +14,14 @@
#include <cmath>
-#include <QtCore/QDir>
-#include <QtCore/QRect>
-#include <QtCore/QSize>
-#include <QtCore/QVector>
-#include <QtGui/QApplication>
-#include <QtGui/QImage>
-#include <QtGui/QImageReader>
-#include <QtGui/QPainter>
+#include <QDir>
+#include <QRect>
+#include <QSize>
+#include <QVector>
+#include <QApplication>
+#include <QImage>
+#include <QImageReader>
+#include <QPainter>
#include "MarbleGlobal.h"
#include "MarbleDirs.h"
diff --git a/src/lib/TileCreatorDialog.cpp b/src/lib/TileCreatorDialog.cpp
index c264d97..eb09b02 100644
--- a/src/lib/TileCreatorDialog.cpp
+++ b/src/lib/TileCreatorDialog.cpp
@@ -14,7 +14,7 @@
#include "TileCreatorDialog.h"
// Qt
-#include <QtCore/QTimer>
+#include <QTimer>
// Marble
#include "MarbleDebug.h"
diff --git a/src/lib/TileId.cpp b/src/lib/TileId.cpp
index e3aace7..a1a0af9 100644
--- a/src/lib/TileId.cpp
+++ b/src/lib/TileId.cpp
@@ -13,8 +13,8 @@
#include "TileId.h"
#include "GeoDataCoordinates.h"
-#include <QtCore/QDebug>
-#include <QtCore/QStringList>
+#include <QDebug>
+#include <QStringList>
namespace Marble
{
diff --git a/src/lib/TileLoader.cpp b/src/lib/TileLoader.cpp
index 231be10..0f54b75 100644
--- a/src/lib/TileLoader.cpp
+++ b/src/lib/TileLoader.cpp
@@ -20,10 +20,10 @@
#include "TileLoader.h"
-#include <QtCore/QDateTime>
-#include <QtCore/QFileInfo>
-#include <QtCore/QMetaType>
-#include <QtGui/QImage>
+#include <QDateTime>
+#include <QFileInfo>
+#include <QMetaType>
+#include <QImage>
#include "MarbleRunnerManager.h"
diff --git a/src/lib/TileScalingTextureMapper.cpp \
b/src/lib/TileScalingTextureMapper.cpp index 6d9602c..22c8f1e 100644
--- a/src/lib/TileScalingTextureMapper.cpp
+++ b/src/lib/TileScalingTextureMapper.cpp
@@ -16,8 +16,8 @@
#include <cmath>
// Qt
-#include <QtCore/qmath.h>
-#include <QtGui/QImage>
+#include <qmath.h>
+#include <QImage>
// Marble
#include "GeoPainter.h"
diff --git a/src/lib/TimeControlWidget.cpp b/src/lib/TimeControlWidget.cpp
index 63c1088..abdd3a3 100644
--- a/src/lib/TimeControlWidget.cpp
+++ b/src/lib/TimeControlWidget.cpp
@@ -13,7 +13,7 @@
#include "ui_TimeControlWidget.h"
// Qt
-#include <QtGui/QShowEvent>
+#include <QShowEvent>
// Marble
#include "MarbleClock.h"
diff --git a/src/lib/TinyWebBrowser.cpp b/src/lib/TinyWebBrowser.cpp
index 8ce4949..65ff295 100644
--- a/src/lib/TinyWebBrowser.cpp
+++ b/src/lib/TinyWebBrowser.cpp
@@ -14,15 +14,15 @@
#include "TinyWebBrowser.h"
// Qt
-#include <QtCore/QFileInfo>
-#include <QtCore/QPointer>
-#include <QtCore/QRegExp>
-#include <QtGui/QAction>
-#include <QtGui/QDesktopServices>
-#include <QtGui/QPainter>
-#include <QtGui/QPrintDialog>
-#include <QtGui/QPrinter>
-#include <QtGui/QTextFrame>
+#include <QFileInfo>
+#include <QPointer>
+#include <QRegExp>
+#include <QAction>
+#include <QDesktopServices>
+#include <QPainter>
+#include <QPrintDialog>
+#include <QPrinter>
+#include <QTextFrame>
// Marble
#include "MarbleGlobal.h"
diff --git a/src/lib/VectorComposer.cpp b/src/lib/VectorComposer.cpp
index 4d9600c..f4ac0c7 100644
--- a/src/lib/VectorComposer.cpp
+++ b/src/lib/VectorComposer.cpp
@@ -14,7 +14,7 @@
#include <cmath>
-#include <QtGui/QColor>
+#include <QColor>
#include "MarbleDebug.h"
#include "GeoPolygon.h"
diff --git a/src/lib/VectorMap.cpp b/src/lib/VectorMap.cpp
index cf3dcef..8fe0678 100644
--- a/src/lib/VectorMap.cpp
+++ b/src/lib/VectorMap.cpp
@@ -15,8 +15,8 @@
#include <cmath>
#include <cstdlib>
-#include <QtCore/QVector>
-#include <QtGui/QColor>
+#include <QVector>
+#include <QColor>
#include "MarbleDebug.h"
#include "MarbleGlobal.h"
diff --git a/src/lib/VectorTileModel.cpp b/src/lib/VectorTileModel.cpp
index 4f5f3db..cb14ed5 100644
--- a/src/lib/VectorTileModel.cpp
+++ b/src/lib/VectorTileModel.cpp
@@ -22,7 +22,7 @@
#include "TileLoader.h"
#include <qmath.h>
-#include <QtCore/QThreadPool>
+#include <QThreadPool>
using namespace Marble;
diff --git a/src/lib/ViewportParams.cpp b/src/lib/ViewportParams.cpp
index 90a4762..d6cf036 100644
--- a/src/lib/ViewportParams.cpp
+++ b/src/lib/ViewportParams.cpp
@@ -13,11 +13,11 @@
#include "ViewportParams.h"
-#include <QtCore/QRect>
+#include <QRect>
-#include <QtGui/QPainterPath>
-#include <QtGui/QPainterPathStroker>
-#include <QtGui/QRegion>
+#include <QPainterPath>
+#include <QPainterPathStroker>
+#include <QRegion>
#include "MarbleDebug.h"
#include "SphericalProjection.h"
diff --git a/src/lib/VisiblePlacemark.cpp b/src/lib/VisiblePlacemark.cpp
index 42c1103..c327320 100644
--- a/src/lib/VisiblePlacemark.cpp
+++ b/src/lib/VisiblePlacemark.cpp
@@ -16,10 +16,10 @@
#include "GeoDataStyle.h"
#include "PlacemarkLayer.h"
-#include <QtGui/QApplication>
-#include <QtGui/QPainter>
-#include <QtGui/QPalette>
-#include <QtGui/QPixmap>
+#include <QApplication>
+#include <QPainter>
+#include <QPalette>
+#include <QPixmap>
using namespace Marble;
diff --git a/src/lib/WikipediaService.cpp b/src/lib/WikipediaService.cpp
index ae1ffdd..e791647 100644
--- a/src/lib/WikipediaService.cpp
+++ b/src/lib/WikipediaService.cpp
@@ -9,8 +9,8 @@
//
#include "WikipediaService.h"
-#include <QtWebKit/QWebPage>
-#include <QtWebKit/QWebFrame>
+#include <QWebPage>
+#include <QWebFrame>
#include <QNetworkAccessManager>
#include <QNetworkReply>
#include <QNetworkRequest>
diff --git a/src/lib/blendings/BlendingAlgorithms.cpp \
b/src/lib/blendings/BlendingAlgorithms.cpp index 6dd9647..392ac36 100644
--- a/src/lib/blendings/BlendingAlgorithms.cpp
+++ b/src/lib/blendings/BlendingAlgorithms.cpp
@@ -19,8 +19,8 @@
#include <cmath>
-#include <QtGui/QImage>
-#include <QtGui/QPainter>
+#include <QImage>
+#include <QPainter>
namespace Marble
{
diff --git a/src/lib/blendings/BlendingFactory.cpp \
b/src/lib/blendings/BlendingFactory.cpp index f51d7c9..6230b0e 100644
--- a/src/lib/blendings/BlendingFactory.cpp
+++ b/src/lib/blendings/BlendingFactory.cpp
@@ -15,7 +15,7 @@
#include "BlendingFactory.h"
-#include <QtCore/QDebug>
+#include <QDebug>
#include "blendings/SunLightBlending.h"
#include "BlendingAlgorithms.h"
diff --git a/src/lib/blendings/SunLightBlending.cpp \
b/src/lib/blendings/SunLightBlending.cpp index 6f2f8fb..98621f5 100644
--- a/src/lib/blendings/SunLightBlending.cpp
+++ b/src/lib/blendings/SunLightBlending.cpp
@@ -21,7 +21,7 @@
#include "TileLoaderHelper.h"
#include "MarbleGlobal.h"
-#include <QtGui/QImage>
+#include <QImage>
#include <cmath>
diff --git a/src/lib/geodata/data/GeoDataCamera.cpp \
b/src/lib/geodata/data/GeoDataCamera.cpp index 6e427fe..eb24060 100644
--- a/src/lib/geodata/data/GeoDataCamera.cpp
+++ b/src/lib/geodata/data/GeoDataCamera.cpp
@@ -12,7 +12,7 @@
#include "GeoDataCamera.h"
#include "GeoDataCamera_p.h"
-#include <QtCore/QDataStream>
+#include <QDataStream>
namespace Marble
{
diff --git a/src/lib/geodata/data/GeoDataContainer.cpp \
b/src/lib/geodata/data/GeoDataContainer.cpp index b157e67..61f0ac3 100644
--- a/src/lib/geodata/data/GeoDataContainer.cpp
+++ b/src/lib/geodata/data/GeoDataContainer.cpp
@@ -15,7 +15,7 @@
#include "GeoDataContainer_p.h"
// Qt
-#include <QtGui/QImage>
+#include <QImage>
// Marble
#include "MarbleDebug.h"
diff --git a/src/lib/geodata/data/GeoDataCoordinates.cpp \
b/src/lib/geodata/data/GeoDataCoordinates.cpp index 1f9d140..49490f0 100644
--- a/src/lib/geodata/data/GeoDataCoordinates.cpp
+++ b/src/lib/geodata/data/GeoDataCoordinates.cpp
@@ -16,13 +16,13 @@
#include "GeoDataCoordinates.h"
#include "GeoDataCoordinates_p.h"
-#include <QtCore/qmath.h>
-#include <QtCore/QRegExp>
-#include <QtCore/QLocale>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QAtomicInt>
+#include <qmath.h>
+#include <QRegExp>
+#include <QLocale>
+#include <QString>
+#include <QStringList>
+#include <QCoreApplication>
+#include <QAtomicInt>
#include "MarbleGlobal.h"
#include "MarbleDebug.h"
diff --git a/src/lib/geodata/data/GeoDataData.cpp \
b/src/lib/geodata/data/GeoDataData.cpp index bf9c069..5b86d27 100644
--- a/src/lib/geodata/data/GeoDataData.cpp
+++ b/src/lib/geodata/data/GeoDataData.cpp
@@ -11,7 +11,7 @@
#include "GeoDataData.h"
#include "GeoDataData_p.h"
-#include <QtCore/QDataStream>
+#include <QDataStream>
#include "GeoDataTypes.h"
diff --git a/src/lib/geodata/data/GeoDataExtendedData.cpp \
b/src/lib/geodata/data/GeoDataExtendedData.cpp index fa8e49c..ccbd82a 100644
--- a/src/lib/geodata/data/GeoDataExtendedData.cpp
+++ b/src/lib/geodata/data/GeoDataExtendedData.cpp
@@ -11,7 +11,7 @@
#include "GeoDataExtendedData.h"
#include "GeoDataExtendedData_p.h"
-#include <QtCore/QDataStream>
+#include <QDataStream>
#include "GeoDataTypes.h"
diff --git a/src/lib/geodata/data/GeoDataFeature.cpp \
b/src/lib/geodata/data/GeoDataFeature.cpp index 509654c..f2949c1 100644
--- a/src/lib/geodata/data/GeoDataFeature.cpp
+++ b/src/lib/geodata/data/GeoDataFeature.cpp
@@ -13,9 +13,9 @@
#include "GeoDataFeature.h"
#include "GeoDataFeature_p.h"
-#include <QtCore/QDataStream>
-#include <QtCore/QSize>
-#include <QtGui/QPixmap>
+#include <QDataStream>
+#include <QSize>
+#include <QPixmap>
#include "MarbleDirs.h"
#include "MarbleDebug.h"
diff --git a/src/lib/geodata/data/GeoDataHotSpot.cpp \
b/src/lib/geodata/data/GeoDataHotSpot.cpp index ca4e4f4..3374548 100644
--- a/src/lib/geodata/data/GeoDataHotSpot.cpp
+++ b/src/lib/geodata/data/GeoDataHotSpot.cpp
@@ -12,7 +12,7 @@
#include "GeoDataHotSpot.h"
-#include <QtCore/QDataStream>
+#include <QDataStream>
#include "GeoDataTypes.h"
diff --git a/src/lib/geodata/data/GeoDataLabelStyle.cpp \
b/src/lib/geodata/data/GeoDataLabelStyle.cpp index 648d421..8b77188 100644
--- a/src/lib/geodata/data/GeoDataLabelStyle.cpp
+++ b/src/lib/geodata/data/GeoDataLabelStyle.cpp
@@ -11,7 +11,7 @@
#include "GeoDataLabelStyle.h"
-#include <QtGui/QFont>
+#include <QFont>
#include "GeoDataTypes.h"
diff --git a/src/lib/geodata/data/GeoDataLookAt.cpp \
b/src/lib/geodata/data/GeoDataLookAt.cpp index d18fc86..c3e0aea 100644
--- a/src/lib/geodata/data/GeoDataLookAt.cpp
+++ b/src/lib/geodata/data/GeoDataLookAt.cpp
@@ -15,7 +15,7 @@
#include "MarbleDebug.h"
//Qt
-#include <QtCore/QDataStream>
+#include <QDataStream>
namespace Marble
{
diff --git a/src/lib/geodata/data/GeoDataObject.cpp \
b/src/lib/geodata/data/GeoDataObject.cpp index e8a6774..736b790 100644
--- a/src/lib/geodata/data/GeoDataObject.cpp
+++ b/src/lib/geodata/data/GeoDataObject.cpp
@@ -11,10 +11,10 @@
#include "GeoDataObject.h"
-#include <QtCore/QtGlobal>
-#include <QtCore/QDataStream>
-#include <QtCore/QFileInfo>
-#include <QtCore/QUrl>
+#include <QtGlobal>
+#include <QDataStream>
+#include <QFileInfo>
+#include <QUrl>
#include "GeoDataDocument.h"
diff --git a/src/lib/geodata/data/GeoDataOverlay.cpp \
b/src/lib/geodata/data/GeoDataOverlay.cpp index ee327f4..dd02665 100644
--- a/src/lib/geodata/data/GeoDataOverlay.cpp
+++ b/src/lib/geodata/data/GeoDataOverlay.cpp
@@ -11,8 +11,8 @@
#include "GeoDataOverlay.h"
#include "GeoDataDocument.h"
-#include <QtCore/QFileInfo>
-#include <QtCore/QDir>
+#include <QFileInfo>
+#include <QDir>
namespace Marble {
diff --git a/src/lib/geodata/data/GeoDataPlacemark.cpp \
b/src/lib/geodata/data/GeoDataPlacemark.cpp index b0c3634..ddaceda 100644
--- a/src/lib/geodata/data/GeoDataPlacemark.cpp
+++ b/src/lib/geodata/data/GeoDataPlacemark.cpp
@@ -21,7 +21,7 @@
#include "GeoDataCoordinates.h"
// Qt
-#include <QtCore/QDataStream>
+#include <QDataStream>
#include "MarbleDebug.h"
#include "GeoDataTrack.h"
diff --git a/src/lib/geodata/data/GeoDataPoint.cpp \
b/src/lib/geodata/data/GeoDataPoint.cpp index 0aa188c..9ae0275 100644
--- a/src/lib/geodata/data/GeoDataPoint.cpp
+++ b/src/lib/geodata/data/GeoDataPoint.cpp
@@ -17,7 +17,7 @@
#include <cmath>
-#include <QtCore/QCoreApplication>
+#include <QCoreApplication>
#include "MarbleDebug.h"
#include "MarbleGlobal.h"
diff --git a/src/lib/geodata/data/GeoDataSimpleArrayData.cpp \
b/src/lib/geodata/data/GeoDataSimpleArrayData.cpp index df50909..f1e6f0c 100644
--- a/src/lib/geodata/data/GeoDataSimpleArrayData.cpp
+++ b/src/lib/geodata/data/GeoDataSimpleArrayData.cpp
@@ -13,8 +13,8 @@
#include "GeoDataTypes.h"
#include "MarbleDebug.h"
-#include <QtCore/QMap>
-#include <QtCore/QLinkedList>
+#include <QMap>
+#include <QLinkedList>
namespace Marble {
diff --git a/src/lib/geodata/data/GeoDataStyleMap.cpp \
b/src/lib/geodata/data/GeoDataStyleMap.cpp index 573831b..2e7313a 100644
--- a/src/lib/geodata/data/GeoDataStyleMap.cpp
+++ b/src/lib/geodata/data/GeoDataStyleMap.cpp
@@ -10,7 +10,7 @@
#include "GeoDataStyleMap.h"
-#include <QtCore/QDataStream>
+#include <QDataStream>
#include "GeoDataTypes.h"
diff --git a/src/lib/geodata/data/GeoDataStyleSelector.cpp \
b/src/lib/geodata/data/GeoDataStyleSelector.cpp index 7e3bf63..644158b 100644
--- a/src/lib/geodata/data/GeoDataStyleSelector.cpp
+++ b/src/lib/geodata/data/GeoDataStyleSelector.cpp
@@ -10,7 +10,7 @@
#include "GeoDataStyleSelector.h"
-#include <QtCore/QDataStream>
+#include <QDataStream>
#include "GeoDataTypes.h"
diff --git a/src/lib/geodata/data/GeoDataTimePrimitive.cpp \
b/src/lib/geodata/data/GeoDataTimePrimitive.cpp index 56c0fc0..5837cf6 100644
--- a/src/lib/geodata/data/GeoDataTimePrimitive.cpp
+++ b/src/lib/geodata/data/GeoDataTimePrimitive.cpp
@@ -15,7 +15,7 @@
#include "GeoDataTimePrimitive_p.h"
// Qt
-#include <QtCore/QDataStream>
+#include <QDataStream>
// GeoData
#include "GeoDataTypes.h"
diff --git a/src/lib/geodata/data/GeoDataTimeSpan.cpp \
b/src/lib/geodata/data/GeoDataTimeSpan.cpp index aa35212..3ca8a25 100644
--- a/src/lib/geodata/data/GeoDataTimeSpan.cpp
+++ b/src/lib/geodata/data/GeoDataTimeSpan.cpp
@@ -15,7 +15,7 @@
#include "GeoDataTimeSpan_p.h"
// Qt
-#include <QtCore/QDataStream>
+#include <QDataStream>
// GeoData
#include "GeoDataTypes.h"
diff --git a/src/lib/geodata/data/GeoDataTimeStamp.cpp \
b/src/lib/geodata/data/GeoDataTimeStamp.cpp index b2662c4..e65539a 100644
--- a/src/lib/geodata/data/GeoDataTimeStamp.cpp
+++ b/src/lib/geodata/data/GeoDataTimeStamp.cpp
@@ -15,7 +15,7 @@
#include "GeoDataTimeStamp_p.h"
// Qt
-#include <QtCore/QDataStream>
+#include <QDataStream>
// GeoData
#include "GeoDataTypes.h"
diff --git a/src/lib/geodata/data/GeoDataTrack.cpp \
b/src/lib/geodata/data/GeoDataTrack.cpp index 73d8b45..77bb603 100644
--- a/src/lib/geodata/data/GeoDataTrack.cpp
+++ b/src/lib/geodata/data/GeoDataTrack.cpp
@@ -17,8 +17,8 @@
#include "GeoDataLineString.h"
-#include <QtCore/QMap>
-#include <QtCore/QLinkedList>
+#include <QMap>
+#include <QLinkedList>
#include "GeoDataExtendedData.h"
namespace Marble {
diff --git a/src/lib/geodata/graphicsitem/GeoPhotoGraphicsItem.cpp \
b/src/lib/geodata/graphicsitem/GeoPhotoGraphicsItem.cpp index 0632ff8..4fab8fb 100644
--- a/src/lib/geodata/graphicsitem/GeoPhotoGraphicsItem.cpp
+++ b/src/lib/geodata/graphicsitem/GeoPhotoGraphicsItem.cpp
@@ -13,9 +13,9 @@
#include "GeoPainter.h"
#include "ViewportParams.h"
-#include <QtGui/QImageReader>
+#include <QImageReader>
-#include <QtCore/QDebug>
+#include <QDebug>
namespace Marble
{
diff --git a/src/lib/geodata/handlers/dgml/DgmlBrushTagHandler.cpp \
b/src/lib/geodata/handlers/dgml/DgmlBrushTagHandler.cpp index 50ce419..2562860 100644
--- a/src/lib/geodata/handlers/dgml/DgmlBrushTagHandler.cpp
+++ b/src/lib/geodata/handlers/dgml/DgmlBrushTagHandler.cpp
@@ -21,9 +21,9 @@
#include "DgmlBrushTagHandler.h"
-#include <QtGui/QBrush>
-#include <QtGui/QColor>
-#include <QtCore/QString>
+#include <QBrush>
+#include <QColor>
+#include <QString>
#include "DgmlElementDictionary.h"
#include "DgmlAttributeDictionary.h"
diff --git a/src/lib/geodata/handlers/dgml/DgmlDownloadUrlTagHandler.cpp \
b/src/lib/geodata/handlers/dgml/DgmlDownloadUrlTagHandler.cpp index 065471b..9e3b978 \
100644
--- a/src/lib/geodata/handlers/dgml/DgmlDownloadUrlTagHandler.cpp
+++ b/src/lib/geodata/handlers/dgml/DgmlDownloadUrlTagHandler.cpp
@@ -23,7 +23,7 @@
#include "DgmlDownloadUrlTagHandler.h"
// Qt
-#include <QtCore/QUrl>
+#include <QUrl>
// Marble
#include "DgmlAttributeDictionary.h"
diff --git a/src/lib/geodata/handlers/dgml/DgmlIconTagHandler.cpp \
b/src/lib/geodata/handlers/dgml/DgmlIconTagHandler.cpp index 61b002e..7d8f774 100644
--- a/src/lib/geodata/handlers/dgml/DgmlIconTagHandler.cpp
+++ b/src/lib/geodata/handlers/dgml/DgmlIconTagHandler.cpp
@@ -23,7 +23,7 @@
#include "DgmlIconTagHandler.h"
// Qt
-#include <QtGui/QColor>
+#include <QColor>
// Marble
#include "DgmlElementDictionary.h"
diff --git a/src/lib/geodata/handlers/dgml/DgmlMapTagHandler.cpp \
b/src/lib/geodata/handlers/dgml/DgmlMapTagHandler.cpp index 7f9d1b1..fb7ff0f 100644
--- a/src/lib/geodata/handlers/dgml/DgmlMapTagHandler.cpp
+++ b/src/lib/geodata/handlers/dgml/DgmlMapTagHandler.cpp
@@ -22,7 +22,7 @@
#include "DgmlMapTagHandler.h"
-#include <QtGui/QColor>
+#include <QColor>
#include "MarbleDebug.h"
diff --git a/src/lib/geodata/handlers/dgml/DgmlPenTagHandler.cpp \
b/src/lib/geodata/handlers/dgml/DgmlPenTagHandler.cpp index 687ab61..16a5a0c 100644
--- a/src/lib/geodata/handlers/dgml/DgmlPenTagHandler.cpp
+++ b/src/lib/geodata/handlers/dgml/DgmlPenTagHandler.cpp
@@ -21,9 +21,9 @@
#include "DgmlPenTagHandler.h"
-#include <QtGui/QPen>
-#include <QtGui/QColor>
-#include <QtCore/QString>
+#include <QPen>
+#include <QColor>
+#include <QString>
#include "DgmlElementDictionary.h"
#include "DgmlAttributeDictionary.h"
diff --git a/src/lib/geodata/handlers/kml/KmlBeginTagHandler.cpp \
b/src/lib/geodata/handlers/kml/KmlBeginTagHandler.cpp index 626ea9e..8d660bd 100644
--- a/src/lib/geodata/handlers/kml/KmlBeginTagHandler.cpp
+++ b/src/lib/geodata/handlers/kml/KmlBeginTagHandler.cpp
@@ -11,7 +11,7 @@
#include "KmlBeginTagHandler.h"
#include "MarbleDebug.h"
-#include <QtCore/QDateTime>
+#include <QDateTime>
#include "KmlWhenTagHandler.h"
#include "KmlElementDictionary.h"
diff --git a/src/lib/geodata/handlers/kml/KmlColorModeTagHandler.cpp \
b/src/lib/geodata/handlers/kml/KmlColorModeTagHandler.cpp index a0f97ad..f94dbee \
100644
--- a/src/lib/geodata/handlers/kml/KmlColorModeTagHandler.cpp
+++ b/src/lib/geodata/handlers/kml/KmlColorModeTagHandler.cpp
@@ -21,7 +21,7 @@
#include "KmlColorModeTagHandler.h"
-#include <QtGui/QColor>
+#include <QColor>
#include "MarbleDebug.h"
#include "KmlElementDictionary.h"
diff --git a/src/lib/geodata/handlers/kml/KmlColorTagHandler.cpp \
b/src/lib/geodata/handlers/kml/KmlColorTagHandler.cpp index 4bbf14c..7aaf0f1 100644
--- a/src/lib/geodata/handlers/kml/KmlColorTagHandler.cpp
+++ b/src/lib/geodata/handlers/kml/KmlColorTagHandler.cpp
@@ -21,7 +21,7 @@
#include "KmlColorTagHandler.h"
-#include <QtGui/QColor>
+#include <QColor>
#include "MarbleDebug.h"
#include "KmlElementDictionary.h"
diff --git a/src/lib/geodata/handlers/kml/KmlCoordinatesTagHandler.cpp \
b/src/lib/geodata/handlers/kml/KmlCoordinatesTagHandler.cpp index 45bccc3..fdcad86 \
100644
--- a/src/lib/geodata/handlers/kml/KmlCoordinatesTagHandler.cpp
+++ b/src/lib/geodata/handlers/kml/KmlCoordinatesTagHandler.cpp
@@ -21,8 +21,8 @@
#include "KmlCoordinatesTagHandler.h"
-#include <QtCore/QStringList>
-#include <QtCore/QRegExp>
+#include <QStringList>
+#include <QRegExp>
#include "MarbleDebug.h"
#include "KmlElementDictionary.h"
diff --git a/src/lib/geodata/handlers/kml/KmlEndTagHandler.cpp \
b/src/lib/geodata/handlers/kml/KmlEndTagHandler.cpp index 6251277..8be00f7 100644
--- a/src/lib/geodata/handlers/kml/KmlEndTagHandler.cpp
+++ b/src/lib/geodata/handlers/kml/KmlEndTagHandler.cpp
@@ -11,7 +11,7 @@
#include "KmlEndTagHandler.h"
#include "MarbleDebug.h"
-#include <QtCore/QDateTime>
+#include <QDateTime>
#include "KmlWhenTagHandler.h"
#include "KmlElementDictionary.h"
diff --git a/src/lib/geodata/handlers/kml/KmlHrefTagHandler.cpp \
b/src/lib/geodata/handlers/kml/KmlHrefTagHandler.cpp index d1c2518..6f9204a 100644
--- a/src/lib/geodata/handlers/kml/KmlHrefTagHandler.cpp
+++ b/src/lib/geodata/handlers/kml/KmlHrefTagHandler.cpp
@@ -21,7 +21,7 @@
#include "KmlHrefTagHandler.h"
-#include <QtCore/QUrl>
+#include <QUrl>
#include "MarbleDebug.h"
#include "KmlElementDictionary.h"
diff --git a/src/lib/geodata/handlers/kml/KmlStyleUrlTagHandler.cpp \
b/src/lib/geodata/handlers/kml/KmlStyleUrlTagHandler.cpp index 42dad53..38fee3e \
100644
--- a/src/lib/geodata/handlers/kml/KmlStyleUrlTagHandler.cpp
+++ b/src/lib/geodata/handlers/kml/KmlStyleUrlTagHandler.cpp
@@ -21,7 +21,7 @@
#include "KmlStyleUrlTagHandler.h"
-#include <QtCore/QString>
+#include <QString>
#include "KmlElementDictionary.h"
#include "MarbleDebug.h"
diff --git a/src/lib/geodata/handlers/kml/KmlValueTagHandler.cpp \
b/src/lib/geodata/handlers/kml/KmlValueTagHandler.cpp index 75853ca..56edb97 100644
--- a/src/lib/geodata/handlers/kml/KmlValueTagHandler.cpp
+++ b/src/lib/geodata/handlers/kml/KmlValueTagHandler.cpp
@@ -17,7 +17,7 @@
#include "GeoDataSimpleArrayData.h"
#include "GeoParser.h"
-#include <QtCore/QVariant>
+#include <QVariant>
namespace Marble
{
diff --git a/src/lib/geodata/handlers/kml/KmlWhenTagHandler.cpp \
b/src/lib/geodata/handlers/kml/KmlWhenTagHandler.cpp index ba1cb31..6c98324 100644
--- a/src/lib/geodata/handlers/kml/KmlWhenTagHandler.cpp
+++ b/src/lib/geodata/handlers/kml/KmlWhenTagHandler.cpp
@@ -11,7 +11,7 @@
#include "KmlWhenTagHandler.h"
#include "MarbleDebug.h"
-#include <QtCore/QDateTime>
+#include <QDateTime>
#include "KmlElementDictionary.h"
#include "GeoDataTimeStamp.h"
diff --git a/src/lib/geodata/scene/GeoSceneGeodata.cpp \
b/src/lib/geodata/scene/GeoSceneGeodata.cpp index 7624816..6bd1885 100644
--- a/src/lib/geodata/scene/GeoSceneGeodata.cpp
+++ b/src/lib/geodata/scene/GeoSceneGeodata.cpp
@@ -11,7 +11,7 @@
#include "GeoSceneGeodata.h"
#include "GeoSceneTypes.h"
-#include <QtCore/QDebug>
+#include <QDebug>
namespace Marble
{
diff --git a/src/lib/geodata/scene/GeoSceneTiled.cpp \
b/src/lib/geodata/scene/GeoSceneTiled.cpp index f7018c3..99d01c4 100644
--- a/src/lib/geodata/scene/GeoSceneTiled.cpp
+++ b/src/lib/geodata/scene/GeoSceneTiled.cpp
@@ -21,7 +21,7 @@
#include "ServerLayout.h"
#include "TileId.h"
-#include <QtGui/QImage>
+#include <QImage>
namespace Marble
{
diff --git a/src/lib/geodata/writer/GeoTagWriter.cpp \
b/src/lib/geodata/writer/GeoTagWriter.cpp index 674e773..800fc34 100644
--- a/src/lib/geodata/writer/GeoTagWriter.cpp
+++ b/src/lib/geodata/writer/GeoTagWriter.cpp
@@ -13,7 +13,7 @@
#include "GeoWriter.h"
-#include <QtCore/QDebug>
+#include <QDebug>
namespace Marble
{
diff --git a/src/lib/geodata/writers/kml/KmlDocumentTagWriter.cpp \
b/src/lib/geodata/writers/kml/KmlDocumentTagWriter.cpp index 0669377..7de3ced 100644
--- a/src/lib/geodata/writers/kml/KmlDocumentTagWriter.cpp
+++ b/src/lib/geodata/writers/kml/KmlDocumentTagWriter.cpp
@@ -22,7 +22,7 @@
#include "GeoDataTypes.h"
-#include <QtCore/QVector>
+#include <QVector>
namespace Marble
{
diff --git a/src/lib/geodata/writers/kml/KmlFolderTagWriter.cpp \
b/src/lib/geodata/writers/kml/KmlFolderTagWriter.cpp index 0f2bbec..9b25470 100644
--- a/src/lib/geodata/writers/kml/KmlFolderTagWriter.cpp
+++ b/src/lib/geodata/writers/kml/KmlFolderTagWriter.cpp
@@ -19,7 +19,7 @@
#include "GeoDataTypes.h"
-#include <QtCore/QVector>
+#include <QVector>
namespace Marble
{
diff --git a/src/lib/geodata/writers/kml/KmlTimeStampTagWriter.cpp \
b/src/lib/geodata/writers/kml/KmlTimeStampTagWriter.cpp index b0815fd..43ee092 100644
--- a/src/lib/geodata/writers/kml/KmlTimeStampTagWriter.cpp
+++ b/src/lib/geodata/writers/kml/KmlTimeStampTagWriter.cpp
@@ -15,7 +15,7 @@
#include "GeoWriter.h"
#include "KmlElementDictionary.h"
-#include <QtCore/QDateTime>
+#include <QDateTime>
namespace Marble
{
diff --git a/src/lib/graphicsview/FrameGraphicsItem.cpp \
b/src/lib/graphicsview/FrameGraphicsItem.cpp index c4f4418..00b540d 100644
--- a/src/lib/graphicsview/FrameGraphicsItem.cpp
+++ b/src/lib/graphicsview/FrameGraphicsItem.cpp
@@ -16,9 +16,9 @@
#include "MarbleDebug.h"
// Qt
-#include <QtCore/QSizeF>
-#include <QtGui/QPainter>
-#include <QtGui/QPixmapCache>
+#include <QSizeF>
+#include <QPainter>
+#include <QPixmapCache>
using namespace Marble;
diff --git a/src/lib/graphicsview/LabelGraphicsItem.cpp \
b/src/lib/graphicsview/LabelGraphicsItem.cpp index c819f72..fd2cb41 100644
--- a/src/lib/graphicsview/LabelGraphicsItem.cpp
+++ b/src/lib/graphicsview/LabelGraphicsItem.cpp
@@ -13,10 +13,10 @@
#include "LabelGraphicsItem_p.h"
// Qt
-#include <QtCore/QString>
-#include <QtGui/QApplication>
-#include <QtGui/QFont>
-#include <QtGui/QPainter>
+#include <QString>
+#include <QApplication>
+#include <QFont>
+#include <QPainter>
using namespace Marble;
diff --git a/src/lib/graphicsview/MarbleGraphicsGridLayout.cpp \
b/src/lib/graphicsview/MarbleGraphicsGridLayout.cpp index 453a8b6..94eca83 100644
--- a/src/lib/graphicsview/MarbleGraphicsGridLayout.cpp
+++ b/src/lib/graphicsview/MarbleGraphicsGridLayout.cpp
@@ -16,10 +16,10 @@
#include "ScreenGraphicsItem.h"
// Qt
-#include <QtCore/QHash>
-#include <QtCore/QRectF>
-#include <QtCore/QSizeF>
-#include <QtCore/QVector>
+#include <QHash>
+#include <QRectF>
+#include <QSizeF>
+#include <QVector>
namespace Marble
{
diff --git a/src/lib/graphicsview/MarbleGraphicsItem.cpp \
b/src/lib/graphicsview/MarbleGraphicsItem.cpp index c061a38..3c29572 100644
--- a/src/lib/graphicsview/MarbleGraphicsItem.cpp
+++ b/src/lib/graphicsview/MarbleGraphicsItem.cpp
@@ -17,11 +17,11 @@
#include "ViewportParams.h"
// Qt
-#include <QtCore/QList>
-#include <QtCore/QSet>
-#include <QtGui/QPainter>
-#include <QtGui/QPixmap>
-#include <QtGui/QMouseEvent>
+#include <QList>
+#include <QSet>
+#include <QPainter>
+#include <QPixmap>
+#include <QMouseEvent>
using namespace Marble;
diff --git a/src/lib/graphicsview/ScreenGraphicsItem.cpp \
b/src/lib/graphicsview/ScreenGraphicsItem.cpp index aaf1b2a..fbacad9 100644
--- a/src/lib/graphicsview/ScreenGraphicsItem.cpp
+++ b/src/lib/graphicsview/ScreenGraphicsItem.cpp
@@ -17,7 +17,7 @@
#include "MarbleWidget.h"
// Qt
-#include <QtGui/QMouseEvent>
+#include <QMouseEvent>
using namespace Marble;
diff --git a/src/lib/graphicsview/WidgetGraphicsItem.cpp \
b/src/lib/graphicsview/WidgetGraphicsItem.cpp index db8ffa0..246e8fd 100644
--- a/src/lib/graphicsview/WidgetGraphicsItem.cpp
+++ b/src/lib/graphicsview/WidgetGraphicsItem.cpp
@@ -17,10 +17,10 @@
#include "MarbleDebug.h"
// Qt
-#include <QtGui/QApplication>
-#include <QtGui/QMouseEvent>
-#include <QtGui/QPainter>
-#include <QtGui/QWidget>
+#include <QApplication>
+#include <QMouseEvent>
+#include <QPainter>
+#include <QWidget>
using namespace Marble;
diff --git a/src/lib/kdescendantsproxymodel.cpp b/src/lib/kdescendantsproxymodel.cpp
index 1c58897..4e04b44 100644
--- a/src/lib/kdescendantsproxymodel.cpp
+++ b/src/lib/kdescendantsproxymodel.cpp
@@ -22,8 +22,8 @@
#include "kdescendantsproxymodel.h"
-#include <QtCore/QStringList>
-#include <QtCore/QTimer>
+#include <QStringList>
+#include <QTimer>
#include "kbihash_p.h"
diff --git a/src/lib/kineticmodel.cpp b/src/lib/kineticmodel.cpp
index 54ac8a6..b246781 100644
--- a/src/lib/kineticmodel.cpp
+++ b/src/lib/kineticmodel.cpp
@@ -29,8 +29,8 @@
#include "kineticmodel.h"
-#include <QtCore/QTimer>
-#include <QtCore/QDateTime>
+#include <QTimer>
+#include <QDateTime>
static const int KineticModelDefaultUpdateInterval = 15; // ms
diff --git a/src/lib/layers/FpsLayer.cpp b/src/lib/layers/FpsLayer.cpp
index 411c557..9d19669 100644
--- a/src/lib/layers/FpsLayer.cpp
+++ b/src/lib/layers/FpsLayer.cpp
@@ -12,10 +12,10 @@
#include "FpsLayer.h"
-#include <QtCore/QPoint>
-#include <QtCore/QTime>
-#include <QtGui/QFont>
-#include <QtGui/QPainter>
+#include <QPoint>
+#include <QTime>
+#include <QFont>
+#include <QPainter>
namespace Marble
{
diff --git a/src/lib/layers/GeometryLayer.cpp b/src/lib/layers/GeometryLayer.cpp
index e829b6d..1bba353 100644
--- a/src/lib/layers/GeometryLayer.cpp
+++ b/src/lib/layers/GeometryLayer.cpp
@@ -45,9 +45,9 @@
#include "MarblePlacemarkModel.h"
// Qt
-#include <QtCore/qmath.h>
-#include <QtCore/QAbstractItemModel>
-#include <QtCore/QModelIndex>
+#include <qmath.h>
+#include <QAbstractItemModel>
+#include <QModelIndex>
namespace Marble
{
diff --git a/src/lib/layers/MarbleSplashLayer.cpp \
b/src/lib/layers/MarbleSplashLayer.cpp index bed786a..e2647f3 100644
--- a/src/lib/layers/MarbleSplashLayer.cpp
+++ b/src/lib/layers/MarbleSplashLayer.cpp
@@ -17,7 +17,7 @@
#include "MarbleDirs.h"
#include "ViewportParams.h"
-#include <QtGui/QPixmap>
+#include <QPixmap>
namespace Marble
{
diff --git a/src/lib/layers/PlacemarkLayer.cpp b/src/lib/layers/PlacemarkLayer.cpp
index 7f7d4fb..863fd94 100644
--- a/src/lib/layers/PlacemarkLayer.cpp
+++ b/src/lib/layers/PlacemarkLayer.cpp
@@ -12,9 +12,9 @@
#include "PlacemarkLayer.h"
-#include <QtCore/QModelIndex>
-#include <QtCore/QPoint>
-#include <QtGui/QPainter>
+#include <QModelIndex>
+#include <QPoint>
+#include <QPainter>
#include "MarbleDebug.h"
#include "AbstractProjection.h"
diff --git a/src/lib/layers/PopupLayer.cpp b/src/lib/layers/PopupLayer.cpp
index 2345f1e..0388add 100644
--- a/src/lib/layers/PopupLayer.cpp
+++ b/src/lib/layers/PopupLayer.cpp
@@ -14,9 +14,9 @@
#include "MarbleWidget.h"
#include "PopupItem.h"
-#include <QtGui/QMouseEvent>
-#include <QtGui/QApplication>
-#include <QtGui/QAction>
+#include <QMouseEvent>
+#include <QApplication>
+#include <QAction>
namespace Marble
{
diff --git a/src/lib/layers/TextureLayer.cpp b/src/lib/layers/TextureLayer.cpp
index 5b9e9c9..8679fdf 100644
--- a/src/lib/layers/TextureLayer.cpp
+++ b/src/lib/layers/TextureLayer.cpp
@@ -12,8 +12,8 @@
#include "TextureLayer.h"
-#include <QtCore/qmath.h>
-#include <QtCore/QTimer>
+#include <qmath.h>
+#include <QTimer>
#include "SphericalScanlineTextureMapper.h"
#include "EquirectScanlineTextureMapper.h"
diff --git a/src/lib/layers/VectorTileLayer.cpp b/src/lib/layers/VectorTileLayer.cpp
index c8d5ad2..0f63ca4 100644
--- a/src/lib/layers/VectorTileLayer.cpp
+++ b/src/lib/layers/VectorTileLayer.cpp
@@ -13,8 +13,8 @@
#include "VectorTileLayer.h"
-#include <QtCore/qmath.h>
-#include <QtCore/QThreadPool>
+#include <qmath.h>
+#include <QThreadPool>
#include "VectorTileModel.h"
#include "GeoPainter.h"
diff --git a/src/lib/routing/AlternativeRoutesModel.cpp \
b/src/lib/routing/AlternativeRoutesModel.cpp index dffc15a..72b9c75 100644
--- a/src/lib/routing/AlternativeRoutesModel.cpp
+++ b/src/lib/routing/AlternativeRoutesModel.cpp
@@ -17,8 +17,8 @@
#include "MarbleMath.h"
#include "RoutingModel.h"
-#include <QtCore/QTimer>
-#include <QtGui/QPainter>
+#include <QTimer>
+#include <QPainter>
namespace Marble {
diff --git a/src/lib/routing/RouteRequest.cpp b/src/lib/routing/RouteRequest.cpp
index 47404fc..7de7193 100644
--- a/src/lib/routing/RouteRequest.cpp
+++ b/src/lib/routing/RouteRequest.cpp
@@ -16,8 +16,8 @@
#include "GeoDataExtendedData.h"
#include "MarbleDirs.h"
-#include <QtCore/QMap>
-#include <QtGui/QPainter>
+#include <QMap>
+#include <QPainter>
namespace Marble
{
diff --git a/src/lib/routing/RoutingInputWidget.cpp \
b/src/lib/routing/RoutingInputWidget.cpp index cf1bd89..ed3d523 100644
--- a/src/lib/routing/RoutingInputWidget.cpp
+++ b/src/lib/routing/RoutingInputWidget.cpp
@@ -25,15 +25,15 @@
#include "MarbleLineEdit.h"
#include "GoToDialog.h"
-#include <QtCore/QTimer>
-#include <QtCore/QUrl>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QIcon>
-#include <QtGui/QPushButton>
-#include <QtGui/QMenu>
-#include <QtGui/QToolButton>
-#include <QtGui/QKeyEvent>
-#include <QtXml/QDomDocument>
+#include <QTimer>
+#include <QUrl>
+#include <QHBoxLayout>
+#include <QIcon>
+#include <QPushButton>
+#include <QMenu>
+#include <QToolButton>
+#include <QKeyEvent>
+#include <QDomDocument>
namespace Marble
{
diff --git a/src/lib/routing/RoutingLayer.cpp b/src/lib/routing/RoutingLayer.cpp
index 29d45d9..50e9509 100644
--- a/src/lib/routing/RoutingLayer.cpp
+++ b/src/lib/routing/RoutingLayer.cpp
@@ -25,15 +25,15 @@
#include "RoutingManager.h"
#include "Maneuver.h"
-#include <QtCore/QMap>
-#include <QtCore/QAbstractItemModel>
-#include <QtGui/QIcon>
-#include <QtGui/QItemSelectionModel>
-#include <QtGui/QKeyEvent>
-#include <QtGui/QMenu>
-#include <QtGui/QMouseEvent>
-#include <QtGui/QPixmap>
-#include <QtGui/QFileDialog>
+#include <QMap>
+#include <QAbstractItemModel>
+#include <QIcon>
+#include <QItemSelectionModel>
+#include <QKeyEvent>
+#include <QMenu>
+#include <QMouseEvent>
+#include <QPixmap>
+#include <QFileDialog>
namespace Marble
{
diff --git a/src/lib/routing/RoutingManager.cpp b/src/lib/routing/RoutingManager.cpp
index bb99760..d78f714 100644
--- a/src/lib/routing/RoutingManager.cpp
+++ b/src/lib/routing/RoutingManager.cpp
@@ -29,9 +29,9 @@
#include "PluginManager.h"
#include "PositionProviderPlugin.h"
-#include <QtCore/QFile>
-#include <QtGui/QMessageBox>
-#include <QtGui/QCheckBox>
+#include <QFile>
+#include <QMessageBox>
+#include <QCheckBox>
#include <QMutexLocker>
namespace Marble
diff --git a/src/lib/routing/RoutingModel.cpp b/src/lib/routing/RoutingModel.cpp
index 6ff0a92..b80f437 100644
--- a/src/lib/routing/RoutingModel.cpp
+++ b/src/lib/routing/RoutingModel.cpp
@@ -25,15 +25,15 @@
#include "MarbleGlobal.h"
#include "GeoDataExtendedData.h"
-#include <QtCore/QBuffer>
-#include <QtCore/QPointer>
-#include <QtCore/QRegExp>
-#include <QtCore/QVector>
-#include <QtCore/QHash>
-#include <QtCore/QByteArray>
-#include <QtGui/QMessageBox>
-#include <QtGui/QPixmap>
-#include <QtXml/QDomDocument>
+#include <QBuffer>
+#include <QPointer>
+#include <QRegExp>
+#include <QVector>
+#include <QHash>
+#include <QByteArray>
+#include <QMessageBox>
+#include <QPixmap>
+#include <QDomDocument>
namespace Marble
{
diff --git a/src/lib/routing/RoutingWidget.cpp b/src/lib/routing/RoutingWidget.cpp
index 8a4a988..afe1cdd 100644
--- a/src/lib/routing/RoutingWidget.cpp
+++ b/src/lib/routing/RoutingWidget.cpp
@@ -25,16 +25,16 @@
#include "GeoDataDocument.h"
#include "AlternativeRoutesModel.h"
-#include <QtCore/QTime>
-#include <QtCore/QTimer>
-#include <QtGui/QSortFilterProxyModel>
-#include <QtGui/QComboBox>
-#include <QtGui/QPainter>
-#include <QtGui/QFileDialog>
-#include <QtGui/QKeyEvent>
-#include <QtGui/QMouseEvent>
-#include <QtGui/QToolBar>
-#include <QtGui/QToolButton>
+#include <QTime>
+#include <QTimer>
+#include <QSortFilterProxyModel>
+#include <QComboBox>
+#include <QPainter>
+#include <QFileDialog>
+#include <QKeyEvent>
+#include <QMouseEvent>
+#include <QToolBar>
+#include <QToolButton>
#include "ui_RoutingWidget.h"
diff --git a/src/lib/routing/instructions/RoutingInstruction.cpp \
b/src/lib/routing/instructions/RoutingInstruction.cpp index e79d071..4ae8829 100644
--- a/src/lib/routing/instructions/RoutingInstruction.cpp
+++ b/src/lib/routing/instructions/RoutingInstruction.cpp
@@ -10,8 +10,8 @@
#include "RoutingInstruction.h"
-#include <QtCore/QCoreApplication>
-#include <QtCore/QStringList>
+#include <QCoreApplication>
+#include <QStringList>
#include <cmath>
diff --git a/src/lib/routing/instructions/RoutingWaypoint.cpp \
b/src/lib/routing/instructions/RoutingWaypoint.cpp index 7046b5f..b44c9e4 100644
--- a/src/lib/routing/instructions/RoutingWaypoint.cpp
+++ b/src/lib/routing/instructions/RoutingWaypoint.cpp
@@ -10,7 +10,7 @@
#include "RoutingWaypoint.h"
-#include <QtCore/QDebug>
+#include <QDebug>
namespace Marble
{
diff --git a/src/lib/routing/instructions/WaypointParser.cpp \
b/src/lib/routing/instructions/WaypointParser.cpp index 453e30a..3fd792e 100644
--- a/src/lib/routing/instructions/WaypointParser.cpp
+++ b/src/lib/routing/instructions/WaypointParser.cpp
@@ -10,8 +10,8 @@
#include "WaypointParser.h"
-#include <QtCore/QDebug>
-#include <QtCore/QStringList>
+#include <QDebug>
+#include <QStringList>
namespace Marble
{
diff --git a/src/marble_part.cpp b/src/marble_part.cpp
index c9e470e..03ca011 100644
--- a/src/marble_part.cpp
+++ b/src/marble_part.cpp
@@ -15,19 +15,19 @@
#include "marble_part.h"
// Qt
-#include <QtCore/QDir>
-#include <QtCore/QPointer>
-#include <QtCore/QStringList>
-#include <QtCore/QTimer>
-#include <QtGui/QClipboard>
-#include <QtGui/QLabel>
-#include <QtGui/QFontMetrics>
-#include <QtGui/QPrinter>
-#include <QtGui/QPrintDialog>
-#include <QtGui/QProgressBar>
-#include <QtGui/QStandardItemModel>
-#include <QtGui/QShortcut>
-#include <QtNetwork/QNetworkProxy>
+#include <QDir>
+#include <QPointer>
+#include <QStringList>
+#include <QTimer>
+#include <QClipboard>
+#include <QLabel>
+#include <QFontMetrics>
+#include <QPrinter>
+#include <QPrintDialog>
+#include <QProgressBar>
+#include <QStandardItemModel>
+#include <QShortcut>
+#include <QNetworkProxy>
// KDE
#include <kaboutdata.h>
diff --git a/src/plasmoid/worldclock.cpp b/src/plasmoid/worldclock.cpp
index e74de89..da81d51 100644
--- a/src/plasmoid/worldclock.cpp
+++ b/src/plasmoid/worldclock.cpp
@@ -18,16 +18,16 @@
#include "worldclock.h"
//Qt
-#include <QtGui/QPainter>
-#include <QtGui/QRadialGradient>
-#include <QtGui/QBrush>
-#include <QtGui/QGraphicsSceneHoverEvent>
-#include <QtCore/QList>
-#include <QtCore/QSize>
-#include <QtCore/QRect>
-#include <QtCore/QTime>
-#include <QtCore/QDate>
-#include <QtCore/QDateTime>
+#include <QPainter>
+#include <QRadialGradient>
+#include <QBrush>
+#include <QGraphicsSceneHoverEvent>
+#include <QList>
+#include <QSize>
+#include <QRect>
+#include <QTime>
+#include <QDate>
+#include <QDateTime>
//KDE
#include <KDebug>
diff --git a/src/plugins/declarative/Bookmarks.cpp \
b/src/plugins/declarative/Bookmarks.cpp index 1b771cd..0e2951f 100644
--- a/src/plugins/declarative/Bookmarks.cpp
+++ b/src/plugins/declarative/Bookmarks.cpp
@@ -23,7 +23,7 @@
#include "GeoDataTreeModel.h"
#include "kdescendantsproxymodel.h"
-#include <QtGui/QSortFilterProxyModel>
+#include <QSortFilterProxyModel>
Bookmarks::Bookmarks( QObject* parent ) : QObject( parent ),
m_marbleWidget( 0 ), m_proxyModel( 0 )
diff --git a/src/plugins/declarative/DeclarativeDataPlugin.cpp \
b/src/plugins/declarative/DeclarativeDataPlugin.cpp index 1c7dd34..1dd7dfe 100644
--- a/src/plugins/declarative/DeclarativeDataPlugin.cpp
+++ b/src/plugins/declarative/DeclarativeDataPlugin.cpp
@@ -19,9 +19,9 @@
#include "MarbleWidget.h"
#include "MarbleModel.h"
-#include <QtCore/QMetaObject>
-#include <QtCore/QMetaProperty>
-#include <QtScript/QScriptValue>
+#include <QMetaObject>
+#include <QMetaProperty>
+#include <QScriptValue>
using namespace Marble;
diff --git a/src/plugins/declarative/DeclarativeMapThemeManager.cpp \
b/src/plugins/declarative/DeclarativeMapThemeManager.cpp index 5db9ce0..8e3506c \
100644
--- a/src/plugins/declarative/DeclarativeMapThemeManager.cpp
+++ b/src/plugins/declarative/DeclarativeMapThemeManager.cpp
@@ -13,9 +13,9 @@
#include "GeoSceneDocument.h"
#include "GeoSceneHead.h"
-#include <QtGui/QIcon>
-#include <QtGui/QStandardItemModel>
-#include <QtCore/QDebug>
+#include <QIcon>
+#include <QStandardItemModel>
+#include <QDebug>
MapThemeImageProvider::MapThemeImageProvider() :
QDeclarativeImageProvider( QDeclarativeImageProvider::Pixmap )
diff --git a/src/plugins/declarative/MapThemeModel.cpp \
b/src/plugins/declarative/MapThemeModel.cpp index 69dd839..221976d 100644
--- a/src/plugins/declarative/MapThemeModel.cpp
+++ b/src/plugins/declarative/MapThemeModel.cpp
@@ -15,9 +15,9 @@
#include "GeoSceneHead.h"
#include "GeoSceneZoom.h"
-#include <QtCore/QModelIndex>
-#include <QtCore/QDebug>
-#include <QtGui/QStandardItemModel>
+#include <QModelIndex>
+#include <QDebug>
+#include <QStandardItemModel>
MapThemeModel::MapThemeModel( QObject *parent ) : QSortFilterProxyModel( parent ),
m_themeManager( new Marble::MapThemeManager( this ) ), m_mapThemeFilters( \
MapThemeModel::AnyTheme )
diff --git a/src/plugins/declarative/MarbleDeclarativeObject.cpp \
b/src/plugins/declarative/MarbleDeclarativeObject.cpp index 055bd95..e9a5e2f 100644
--- a/src/plugins/declarative/MarbleDeclarativeObject.cpp
+++ b/src/plugins/declarative/MarbleDeclarativeObject.cpp
@@ -13,7 +13,7 @@
#include "MarbleDirs.h"
#include "MarbleGlobal.h"
-#include <QtCore/QProcessEnvironment>
+#include <QProcessEnvironment>
class MarbleDeclarativeObjectPrivate
{
diff --git a/src/plugins/declarative/MarbleDeclarativePlugin.cpp \
b/src/plugins/declarative/MarbleDeclarativePlugin.cpp index d527b3a..1adbb0f 100644
--- a/src/plugins/declarative/MarbleDeclarativePlugin.cpp
+++ b/src/plugins/declarative/MarbleDeclarativePlugin.cpp
@@ -33,8 +33,8 @@
#include "RenderPlugin.h"
#include "DeclarativeDataPlugin.h"
-#include <QtDeclarative/qdeclarative.h>
-#include <QtDeclarative/QDeclarativeEngine>
+#include <qdeclarative.h>
+#include <QDeclarativeEngine>
void MarbleDeclarativePlugin::registerTypes( const char * )
{
diff --git a/src/plugins/declarative/OfflineDataModel.cpp \
b/src/plugins/declarative/OfflineDataModel.cpp index eebcc93..ca809c7 100644
--- a/src/plugins/declarative/OfflineDataModel.cpp
+++ b/src/plugins/declarative/OfflineDataModel.cpp
@@ -11,8 +11,8 @@
#include "OfflineDataModel.h"
#include "MarbleDirs.h"
-#include <QtCore/QModelIndex>
-#include <QtCore/QDir>
+#include <QModelIndex>
+#include <QDir>
OfflineDataModel::OfflineDataModel( QObject *parent ) : QSortFilterProxyModel( \
parent ), m_vehicleTypeFilter( Any )
diff --git a/src/plugins/declarative/ZoomButtonInterceptor.cpp \
b/src/plugins/declarative/ZoomButtonInterceptor.cpp index 9a19644..cfa0129 100644
--- a/src/plugins/declarative/ZoomButtonInterceptor.cpp
+++ b/src/plugins/declarative/ZoomButtonInterceptor.cpp
@@ -10,8 +10,8 @@
#include "ZoomButtonInterceptor.h"
-#include <QtGui/QKeyEvent>
-#include <QtGui/QApplication>
+#include <QKeyEvent>
+#include <QApplication>
#ifdef HARMATTAN_ZOOMINTERCEPTOR
#include <policy/resource-set.h>
diff --git a/src/plugins/designer/latloneditwidget/LatLonEditPlugin.cpp \
b/src/plugins/designer/latloneditwidget/LatLonEditPlugin.cpp index 626f75e..9ce8c11 \
100644
--- a/src/plugins/designer/latloneditwidget/LatLonEditPlugin.cpp
+++ b/src/plugins/designer/latloneditwidget/LatLonEditPlugin.cpp
@@ -12,12 +12,12 @@
#include "../../lib/LatLonEdit.h"
-#include <QtCore/QObject>
-#include <QtCore/QString>
-#include <QtCore/QtPlugin>
-#include <QtGui/QWidget>
-#include <QtGui/QIcon>
-#include <QtDesigner/QDesignerCustomWidgetInterface>
+#include <QObject>
+#include <QString>
+#include <QtPlugin>
+#include <QWidget>
+#include <QIcon>
+#include <QDesignerCustomWidgetInterface>
LatLonEditPlugin::LatLonEditPlugin(QObject *parent) : QObject(parent)
diff --git a/src/plugins/designer/marblewidget/MarbleWidgetPlugin.cpp \
b/src/plugins/designer/marblewidget/MarbleWidgetPlugin.cpp index 15c4f54..de112c4 \
100644
--- a/src/plugins/designer/marblewidget/MarbleWidgetPlugin.cpp
+++ b/src/plugins/designer/marblewidget/MarbleWidgetPlugin.cpp
@@ -10,7 +10,7 @@
#include "MarbleWidgetPlugin.h"
-#include <QtCore/QtPlugin>
+#include <QtPlugin>
#include "../../lib/MarbleModel.h"
#include "../../lib/MarbleWidget.h"
diff --git a/src/plugins/designer/navigator/MarbleNavigatorPlugin.cpp \
b/src/plugins/designer/navigator/MarbleNavigatorPlugin.cpp index 9ca3bb2..71c7c57 \
100644
--- a/src/plugins/designer/navigator/MarbleNavigatorPlugin.cpp
+++ b/src/plugins/designer/navigator/MarbleNavigatorPlugin.cpp
@@ -10,7 +10,7 @@
#include "MarbleNavigatorPlugin.h"
-#include <QtCore/QtPlugin>
+#include <QtPlugin>
#include "MarbleNavigator.h"
diff --git a/src/plugins/positionprovider/geoclue/GeoCute/Accuracy.cpp \
b/src/plugins/positionprovider/geoclue/GeoCute/Accuracy.cpp index 44603e2..c57eb43 \
100644
--- a/src/plugins/positionprovider/geoclue/GeoCute/Accuracy.cpp
+++ b/src/plugins/positionprovider/geoclue/GeoCute/Accuracy.cpp
@@ -10,7 +10,7 @@
#include "Accuracy.h"
-#include <QtDBus/QDBusArgument>
+#include <QDBusArgument>
diff --git a/src/plugins/positionprovider/geoclue/GeoCute/MasterClient.cpp \
b/src/plugins/positionprovider/geoclue/GeoCute/MasterClient.cpp index \
33011c4..1255b81 100644
--- a/src/plugins/positionprovider/geoclue/GeoCute/MasterClient.cpp
+++ b/src/plugins/positionprovider/geoclue/GeoCute/MasterClient.cpp
@@ -10,10 +10,10 @@
#include "MasterClient_p.h"
-#include <QtCore/QString>
-#include <QtDBus/QDBusMessage>
-#include <QtDBus/QDBusReply>
-#include <QtDBus/QDBusObjectPath>
+#include <QString>
+#include <QDBusMessage>
+#include <QDBusReply>
+#include <QDBusObjectPath>
#include "PositionProvider.h"
diff --git a/src/plugins/positionprovider/geoclue/GeoCute/PositionProvider.cpp \
b/src/plugins/positionprovider/geoclue/GeoCute/PositionProvider.cpp index \
349ea9a..d5f9a90 100644
--- a/src/plugins/positionprovider/geoclue/GeoCute/PositionProvider.cpp
+++ b/src/plugins/positionprovider/geoclue/GeoCute/PositionProvider.cpp
@@ -10,9 +10,9 @@
#include "PositionProvider_p.h"
-#include <QtCore/QList>
-#include <QtCore/QVariant>
-#include <QtDBus/QDBusReply>
+#include <QList>
+#include <QVariant>
+#include <QDBusReply>
#include "MasterClient.h"
diff --git a/src/plugins/positionprovider/geoclue/GeoCute/VelocityProvider.cpp \
b/src/plugins/positionprovider/geoclue/GeoCute/VelocityProvider.cpp index \
9657e1d..7989f78 100644
--- a/src/plugins/positionprovider/geoclue/GeoCute/VelocityProvider.cpp
+++ b/src/plugins/positionprovider/geoclue/GeoCute/VelocityProvider.cpp
@@ -10,7 +10,7 @@
#include "VelocityProvider_p.h"
-#include <QtDBus/QDBusReply>
+#include <QDBusReply>
diff --git a/src/plugins/positionprovider/gpsd/GpsdConnection.cpp \
b/src/plugins/positionprovider/gpsd/GpsdConnection.cpp index feb077f..b021e7f 100644
--- a/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
+++ b/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
@@ -13,7 +13,7 @@
#include "MarbleDebug.h"
-#include <QtCore/QTime>
+#include <QTime>
#include <errno.h>
#include <clocale>
diff --git a/src/plugins/positionprovider/gpsd/GpsdThread.cpp \
b/src/plugins/positionprovider/gpsd/GpsdThread.cpp index ffb8ed6..c19357f 100644
--- a/src/plugins/positionprovider/gpsd/GpsdThread.cpp
+++ b/src/plugins/positionprovider/gpsd/GpsdThread.cpp
@@ -10,7 +10,7 @@
#include "GpsdThread.h"
-#include <QtCore/QMetaType>
+#include <QMetaType>
#include "GpsdConnection.h"
diff --git a/src/plugins/positionprovider/maemo/MaemoPositionProviderPlugin.cpp \
b/src/plugins/positionprovider/maemo/MaemoPositionProviderPlugin.cpp index \
dcf9be6..8af3f5d 100644
--- a/src/plugins/positionprovider/maemo/MaemoPositionProviderPlugin.cpp
+++ b/src/plugins/positionprovider/maemo/MaemoPositionProviderPlugin.cpp
@@ -10,7 +10,7 @@
#include "MaemoPositionProviderPlugin.h"
-#include <QtCore/QTimer>
+#include <QTimer>
#include <location/location-gps-device.h>
#include <location/location-gpsd-control.h>
diff --git a/src/plugins/positionprovider/routesimulation/RouteSimulationPositionProviderPlugin.cpp \
b/src/plugins/positionprovider/routesimulation/RouteSimulationPositionProviderPlugin.cpp
index 294bc4a..9c8cd11 100644
--- a/src/plugins/positionprovider/routesimulation/RouteSimulationPositionProviderPlugin.cpp
+++ b/src/plugins/positionprovider/routesimulation/RouteSimulationPositionProviderPlugin.cpp
@@ -12,7 +12,7 @@
#include "RouteSimulationPositionProviderPlugin.h"
-#include <QtCore/QTimer>
+#include <QTimer>
#include "GeoDataCoordinates.h"
#include "GeoDataDocument.h"
diff --git a/src/plugins/positionprovider/wlocate/WlocatePositionProviderPlugin.cpp \
b/src/plugins/positionprovider/wlocate/WlocatePositionProviderPlugin.cpp index \
ae49766..b202e21 100644
--- a/src/plugins/positionprovider/wlocate/WlocatePositionProviderPlugin.cpp
+++ b/src/plugins/positionprovider/wlocate/WlocatePositionProviderPlugin.cpp
@@ -10,8 +10,8 @@
#include "WlocatePositionProviderPlugin.h"
-#include <QtCore/QFutureWatcher>
-#include <QtCore/QtConcurrentRun>
+#include <QFutureWatcher>
+#include <QtConcurrentRun>
#ifndef ENV_LINUX
#define ENV_LINUX
diff --git a/src/plugins/render/annotate/AnnotatePlugin.cpp \
b/src/plugins/render/annotate/AnnotatePlugin.cpp index 3387513..c6ff1bb 100644
--- a/src/plugins/render/annotate/AnnotatePlugin.cpp
+++ b/src/plugins/render/annotate/AnnotatePlugin.cpp
@@ -29,12 +29,12 @@
#include "MarbleWidget.h"
#include "PlacemarkTextAnnotation.h"
-#include <QtGui/QFileDialog>
-#include <QtGui/QAction>
-#include <QtNetwork/QNetworkAccessManager>
-#include <QtNetwork/QNetworkReply>
-#include <QtNetwork/QNetworkRequest>
-#include <QtGui/QMessageBox>
+#include <QFileDialog>
+#include <QAction>
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
+#include <QNetworkRequest>
+#include <QMessageBox>
namespace Marble
{
diff --git a/src/plugins/render/annotate/GeoWidgetBubble.cpp \
b/src/plugins/render/annotate/GeoWidgetBubble.cpp index 311be63..f7acde7 100644
--- a/src/plugins/render/annotate/GeoWidgetBubble.cpp
+++ b/src/plugins/render/annotate/GeoWidgetBubble.cpp
@@ -15,8 +15,8 @@
#include "MarbleColors.h"
-#include <QtGui/QPainter>
-#include <QtGui/QWidget>
+#include <QPainter>
+#include <QWidget>
namespace Marble
{
diff --git a/src/plugins/render/annotate/PlacemarkTextAnnotation.cpp \
b/src/plugins/render/annotate/PlacemarkTextAnnotation.cpp index 5b7f9b6..bbfecea \
100644
--- a/src/plugins/render/annotate/PlacemarkTextAnnotation.cpp
+++ b/src/plugins/render/annotate/PlacemarkTextAnnotation.cpp
@@ -21,7 +21,7 @@
#include "MarbleDirs.h"
#include "MarbleDebug.h"
-#include <QtGui/QPixmap>
+#include <QPixmap>
namespace Marble
{
diff --git a/src/plugins/render/annotate/SceneGraphicsItem.cpp \
b/src/plugins/render/annotate/SceneGraphicsItem.cpp index 6ce28fb..2c7f92b 100644
--- a/src/plugins/render/annotate/SceneGraphicsItem.cpp
+++ b/src/plugins/render/annotate/SceneGraphicsItem.cpp
@@ -13,7 +13,7 @@
#include "GeoDataPlacemark.h"
-#include <QtCore/QVariant>
+#include <QVariant>
namespace Marble
{
diff --git a/src/plugins/render/annotate/TextEditor.cpp \
b/src/plugins/render/annotate/TextEditor.cpp index 2a5f72e..10d2ac6 100644
--- a/src/plugins/render/annotate/TextEditor.cpp
+++ b/src/plugins/render/annotate/TextEditor.cpp
@@ -14,12 +14,12 @@
#include "GeoDataPlacemark.h"
#include "MarbleDebug.h"
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QLineEdit>
-#include <QtGui/QToolButton>
-#include <QtGui/QTextEdit>
-#include <QtGui/QHBoxLayout>
+#include <QAction>
+#include <QApplication>
+#include <QLineEdit>
+#include <QToolButton>
+#include <QTextEdit>
+#include <QHBoxLayout>
namespace Marble
diff --git a/src/plugins/render/aprs/AprsFile.cpp \
b/src/plugins/render/aprs/AprsFile.cpp index d95ceb2..4963b20 100644
--- a/src/plugins/render/aprs/AprsFile.cpp
+++ b/src/plugins/render/aprs/AprsFile.cpp
@@ -10,7 +10,7 @@
#include "AprsFile.h"
-#include <QtCore/QFile>
+#include <QFile>
#include "MarbleDebug.h"
diff --git a/src/plugins/render/aprs/AprsGatherer.cpp \
b/src/plugins/render/aprs/AprsGatherer.cpp index 5b2efbc..8c0bc92 100644
--- a/src/plugins/render/aprs/AprsGatherer.cpp
+++ b/src/plugins/render/aprs/AprsGatherer.cpp
@@ -10,7 +10,7 @@
#include "AprsGatherer.h"
-#include <QtGui/QPixmap>
+#include <QPixmap>
#include "MarbleDirs.h"
#include "MarbleDebug.h"
diff --git a/src/plugins/render/aprs/AprsObject.cpp \
b/src/plugins/render/aprs/AprsObject.cpp index 70b37da..3e8fe69 100644
--- a/src/plugins/render/aprs/AprsObject.cpp
+++ b/src/plugins/render/aprs/AprsObject.cpp
@@ -10,7 +10,7 @@
#include "AprsObject.h"
-#include <QtGui/QPixmap>
+#include <QPixmap>
#include "MarbleDebug.h"
#include "MarbleDirs.h"
diff --git a/src/plugins/render/aprs/AprsPlugin.cpp \
b/src/plugins/render/aprs/AprsPlugin.cpp index 550192f..2485a30 100644
--- a/src/plugins/render/aprs/AprsPlugin.cpp
+++ b/src/plugins/render/aprs/AprsPlugin.cpp
@@ -13,12 +13,12 @@
#include "MarbleGlobal.h"
#include "MarbleDebug.h"
-#include <QtGui/QColor>
-#include <QtGui/QPixmap>
-#include <QtCore/QTimer>
-#include <QtGui/QAction>
-#include <QtCore/QMutexLocker>
-#include <QtNetwork/QTcpSocket>
+#include <QColor>
+#include <QPixmap>
+#include <QTimer>
+#include <QAction>
+#include <QMutexLocker>
+#include <QTcpSocket>
#include "MarbleDirs.h"
#include "MarbleWidget.h"
diff --git a/src/plugins/render/aprs/AprsTCPIP.cpp \
b/src/plugins/render/aprs/AprsTCPIP.cpp index 33a63e8..e278e1e 100644
--- a/src/plugins/render/aprs/AprsTCPIP.cpp
+++ b/src/plugins/render/aprs/AprsTCPIP.cpp
@@ -10,7 +10,7 @@
#include "AprsTCPIP.h"
-#include <QtNetwork/QTcpSocket>
+#include <QTcpSocket>
#include "MarbleDebug.h"
diff --git a/src/plugins/render/compass/CompassFloatItem.cpp \
b/src/plugins/render/compass/CompassFloatItem.cpp index 4e22b2b..a0a0cac 100644
--- a/src/plugins/render/compass/CompassFloatItem.cpp
+++ b/src/plugins/render/compass/CompassFloatItem.cpp
@@ -16,12 +16,12 @@
#include "MarbleDirs.h"
#include "ViewportParams.h"
-#include <QtCore/QRect>
-#include <QtGui/QColor>
-#include <QtGui/QPainter>
-#include <QtGui/QPixmap>
-#include <QtGui/QPushButton>
-#include <QtSvg/QSvgRenderer>
+#include <QRect>
+#include <QColor>
+#include <QPainter>
+#include <QPixmap>
+#include <QPushButton>
+#include <QSvgRenderer>
namespace Marble
{
diff --git a/src/plugins/render/crosshairs/CrosshairsPlugin.cpp \
b/src/plugins/render/crosshairs/CrosshairsPlugin.cpp index 3863fc9..769b60b 100644
--- a/src/plugins/render/crosshairs/CrosshairsPlugin.cpp
+++ b/src/plugins/render/crosshairs/CrosshairsPlugin.cpp
@@ -17,11 +17,11 @@
#include "MarbleDirs.h"
#include "ViewportParams.h"
-#include <QtCore/QRect>
-#include <QtGui/QColor>
-#include <QtGui/QPixmap>
-#include <QtGui/QPushButton>
-#include <QtSvg/QSvgRenderer>
+#include <QRect>
+#include <QColor>
+#include <QPixmap>
+#include <QPushButton>
+#include <QSvgRenderer>
namespace Marble
diff --git a/src/plugins/render/earthquake/EarthquakeItem.cpp \
b/src/plugins/render/earthquake/EarthquakeItem.cpp index 02c2c39..5f2f0bd 100644
--- a/src/plugins/render/earthquake/EarthquakeItem.cpp
+++ b/src/plugins/render/earthquake/EarthquakeItem.cpp
@@ -11,10 +11,10 @@
#include "EarthquakeItem.h"
#include "ViewportParams.h"
-#include <QtGui/QFontMetrics>
-#include <QtGui/QPainter>
-#include <QtGui/QPixmap>
-#include <QtSvg/QSvgRenderer>
+#include <QFontMetrics>
+#include <QPainter>
+#include <QPixmap>
+#include <QSvgRenderer>
namespace Marble
{
diff --git a/src/plugins/render/earthquake/EarthquakeModel.cpp \
b/src/plugins/render/earthquake/EarthquakeModel.cpp index f021217..ea69955 100644
--- a/src/plugins/render/earthquake/EarthquakeModel.cpp
+++ b/src/plugins/render/earthquake/EarthquakeModel.cpp
@@ -17,13 +17,13 @@
#include "GeoDataLatLonAltBox.h"
#include "MarbleDebug.h"
-#include <QtCore/QDebug>
-#include <QtCore/QString>
-#include <QtCore/QUrl>
-#include <QtGui/QMessageBox>
-#include <QtScript/QScriptEngine>
-#include <QtScript/QScriptValue>
-#include <QtScript/QScriptValueIterator>
+#include <QDebug>
+#include <QString>
+#include <QUrl>
+#include <QMessageBox>
+#include <QScriptEngine>
+#include <QScriptValue>
+#include <QScriptValueIterator>
namespace Marble {
diff --git a/src/plugins/render/earthquake/EarthquakePlugin.cpp \
b/src/plugins/render/earthquake/EarthquakePlugin.cpp index 1205521..0b29252 100644
--- a/src/plugins/render/earthquake/EarthquakePlugin.cpp
+++ b/src/plugins/render/earthquake/EarthquakePlugin.cpp
@@ -12,8 +12,8 @@
#include "EarthquakeModel.h"
#include "ui_EarthquakeConfigWidget.h"
-#include <QtGui/QPushButton>
-#include <QtGui/QSlider>
+#include <QPushButton>
+#include <QSlider>
#include "MarbleModel.h"
diff --git a/src/plugins/render/elevationprofilefloatitem/ElevationProfileFloatItem.cpp \
b/src/plugins/render/elevationprofilefloatitem/ElevationProfileFloatItem.cpp index \
49808c9..c2208f7 100644
--- a/src/plugins/render/elevationprofilefloatitem/ElevationProfileFloatItem.cpp
+++ b/src/plugins/render/elevationprofilefloatitem/ElevationProfileFloatItem.cpp
@@ -11,10 +11,10 @@
#include "ElevationProfileFloatItem.h"
-#include <QtCore/QRect>
-#include <QtGui/QPainter>
-#include <QtGui/QPushButton>
-#include <QtGui/QMenu>
+#include <QRect>
+#include <QPainter>
+#include <QPushButton>
+#include <QMenu>
#include "ui_ElevationProfileConfigWidget.h"
#include "MarbleLocale.h"
diff --git a/src/plugins/render/elevationprofilefloatitem/ElevationProfilePlotAxis.cpp \
b/src/plugins/render/elevationprofilefloatitem/ElevationProfilePlotAxis.cpp index \
0b2bfcd..e9d530a 100644
--- a/src/plugins/render/elevationprofilefloatitem/ElevationProfilePlotAxis.cpp
+++ b/src/plugins/render/elevationprofilefloatitem/ElevationProfilePlotAxis.cpp
@@ -13,7 +13,7 @@
#include "MarbleLocale.h"
#include "MarbleMath.h"
-#include <QtCore/qmath.h>
+#include <qmath.h>
namespace Marble
{
diff --git a/src/plugins/render/elevationprofilemarker/ElevationProfileMarker.cpp \
b/src/plugins/render/elevationprofilemarker/ElevationProfileMarker.cpp index \
b2b4b01..4334a69 100644
--- a/src/plugins/render/elevationprofilemarker/ElevationProfileMarker.cpp
+++ b/src/plugins/render/elevationprofilemarker/ElevationProfileMarker.cpp
@@ -11,7 +11,7 @@
#include "ElevationProfileMarker.h"
-#include <QtCore/QRect>
+#include <QRect>
#include "MarbleLocale.h"
#include "MarbleModel.h"
diff --git a/src/plugins/render/fileview/FileViewFloatItem.cpp \
b/src/plugins/render/fileview/FileViewFloatItem.cpp index 786bc28..ae6e1ba 100644
--- a/src/plugins/render/fileview/FileViewFloatItem.cpp
+++ b/src/plugins/render/fileview/FileViewFloatItem.cpp
@@ -11,16 +11,16 @@
#include "FileViewFloatItem.h"
-#include <QtCore/QRect>
-#include <QtCore/QPoint>
-#include <QtGui/QApplication>
-#include <QtGui/QFileDialog>
-#include <QtGui/QListView>
-#include <QtGui/QListWidget>
-#include <QtGui/QMenu>
-#include <QtGui/QPixmap>
-#include <QtGui/QSlider>
-#include <QtGui/QMouseEvent>
+#include <QRect>
+#include <QPoint>
+#include <QApplication>
+#include <QFileDialog>
+#include <QListView>
+#include <QListWidget>
+#include <QMenu>
+#include <QPixmap>
+#include <QSlider>
+#include <QMouseEvent>
#include "MarbleDebug.h"
#include "FileViewModel.h"
diff --git a/src/plugins/render/foursquare/FoursquareItem.cpp \
b/src/plugins/render/foursquare/FoursquareItem.cpp index 358fa790..dee04db 100644
--- a/src/plugins/render/foursquare/FoursquareItem.cpp
+++ b/src/plugins/render/foursquare/FoursquareItem.cpp
@@ -12,9 +12,9 @@
#include "GeoPainter.h"
#include "ViewportParams.h"
-#include <QtGui/QFontMetrics>
-#include <QtGui/QPixmap>
-#include <QtSvg/QSvgRenderer>
+#include <QFontMetrics>
+#include <QPixmap>
+#include <QSvgRenderer>
namespace Marble
{
diff --git a/src/plugins/render/foursquare/FoursquareModel.cpp \
b/src/plugins/render/foursquare/FoursquareModel.cpp index 0a0fd62..a0a440b 100644
--- a/src/plugins/render/foursquare/FoursquareModel.cpp
+++ b/src/plugins/render/foursquare/FoursquareModel.cpp
@@ -19,10 +19,10 @@
#include "MarbleDebug.h"
#include "MarbleMath.h"
-#include <QtCore/QUrl>
-#include <QtScript/QScriptEngine>
-#include <QtScript/QScriptValue>
-#include <QtScript/QScriptValueIterator>
+#include <QUrl>
+#include <QScriptEngine>
+#include <QScriptValue>
+#include <QScriptValueIterator>
namespace Marble
{
diff --git a/src/plugins/render/graticule/GraticulePlugin.cpp \
b/src/plugins/render/graticule/GraticulePlugin.cpp index 87bad26..7f5b2a7 100644
--- a/src/plugins/render/graticule/GraticulePlugin.cpp
+++ b/src/plugins/render/graticule/GraticulePlugin.cpp
@@ -23,13 +23,13 @@
#include "GeoDataLatLonAltBox.h"
// Qt
-#include <QtGui/QPushButton>
-#include <QtGui/QLabel>
-#include <QtCore/QRect>
-#include <QtGui/QColor>
-#include <QtGui/QPixmap>
-#include <QtSvg/QSvgRenderer>
-#include <QtGui/QBrush>
+#include <QPushButton>
+#include <QLabel>
+#include <QRect>
+#include <QColor>
+#include <QPixmap>
+#include <QSvgRenderer>
+#include <QBrush>
#include <QColorDialog>
#include <QDebug>
diff --git a/src/plugins/render/inhibit-screensaver/InhibitScreensaverPlugin.cpp \
b/src/plugins/render/inhibit-screensaver/InhibitScreensaverPlugin.cpp index \
d646cbf..70b1656 100644
--- a/src/plugins/render/inhibit-screensaver/InhibitScreensaverPlugin.cpp
+++ b/src/plugins/render/inhibit-screensaver/InhibitScreensaverPlugin.cpp
@@ -14,9 +14,9 @@
#include "MarbleDebug.h"
#include "MarbleModel.h"
-#include <QtCore/QTimer>
-#include <QtDBus/QDBusConnection>
-#include <QtDBus/QDBusInterface>
+#include <QTimer>
+#include <QDBusConnection>
+#include <QDBusInterface>
namespace Marble {
diff --git a/src/plugins/render/license/License.cpp \
b/src/plugins/render/license/License.cpp index 7a84ec1..3de8e54 100644
--- a/src/plugins/render/license/License.cpp
+++ b/src/plugins/render/license/License.cpp
@@ -20,11 +20,11 @@
#include "GeoSceneHead.h"
#include "GeoSceneLicense.h"
-#include <QtGui/QMessageBox>
-#include <QtGui/QCommonStyle>
-#include <QtGui/QPainter>
-#include <QtGui/QLabel>
-#include <QtGui/QMenu>
+#include <QMessageBox>
+#include <QCommonStyle>
+#include <QPainter>
+#include <QLabel>
+#include <QMenu>
namespace Marble
{
diff --git a/src/plugins/render/mapscale/MapScaleFloatItem.cpp \
b/src/plugins/render/mapscale/MapScaleFloatItem.cpp index bac707c..1e469bb 100644
--- a/src/plugins/render/mapscale/MapScaleFloatItem.cpp
+++ b/src/plugins/render/mapscale/MapScaleFloatItem.cpp
@@ -11,14 +11,14 @@
#include "MapScaleFloatItem.h"
-#include <QtCore/QDebug>
-#include <QtCore/QRect>
-#include <QtGui/QPixmap>
-#include <QtGui/QApplication>
-#include <QtGui/QPainter>
-#include <QtGui/QPushButton>
-#include <QtGui/QMenu>
-#include <QtGui/QToolTip>
+#include <QDebug>
+#include <QRect>
+#include <QPixmap>
+#include <QApplication>
+#include <QPainter>
+#include <QPushButton>
+#include <QMenu>
+#include <QToolTip>
#include "ui_MapScaleConfigWidget.h"
#include "MarbleDebug.h"
diff --git a/src/plugins/render/measure/MeasureToolPlugin.cpp \
b/src/plugins/render/measure/MeasureToolPlugin.cpp index a74c95d..26a4174 100644
--- a/src/plugins/render/measure/MeasureToolPlugin.cpp
+++ b/src/plugins/render/measure/MeasureToolPlugin.cpp
@@ -23,11 +23,11 @@
#include "MarbleLocale.h"
#include "Planet.h"
-#include <QtGui/QColor>
-#include <QtGui/QPen>
-#include <QtGui/QPixmap>
-#include <QtGui/QPushButton>
-#include <QtGui/QCheckBox>
+#include <QColor>
+#include <QPen>
+#include <QPixmap>
+#include <QPushButton>
+#include <QCheckBox>
namespace Marble
{
diff --git a/src/plugins/render/navigation/ArrowDiscWidget.cpp \
b/src/plugins/render/navigation/ArrowDiscWidget.cpp index 5c2f47b..4db534f 100644
--- a/src/plugins/render/navigation/ArrowDiscWidget.cpp
+++ b/src/plugins/render/navigation/ArrowDiscWidget.cpp
@@ -13,10 +13,10 @@
#include "MarbleWidget.h"
#include <qmath.h>
-#include <QtGui/QPainter>
-#include <QtGui/QMouseEvent>
-#include <QtGui/QPixmapCache>
-#include <QtGui/QPainterPath>
+#include <QPainter>
+#include <QMouseEvent>
+#include <QPixmapCache>
+#include <QPainterPath>
namespace Marble
{
diff --git a/src/plugins/render/navigation/NavigationButton.cpp \
b/src/plugins/render/navigation/NavigationButton.cpp index e115dd6..5079c83 100644
--- a/src/plugins/render/navigation/NavigationButton.cpp
+++ b/src/plugins/render/navigation/NavigationButton.cpp
@@ -10,8 +10,8 @@
#include "NavigationButton.h"
-#include <QtGui/QPainter>
-#include <QtGui/QMouseEvent>
+#include <QPainter>
+#include <QMouseEvent>
namespace Marble
{
diff --git a/src/plugins/render/navigation/NavigationFloatItem.cpp \
b/src/plugins/render/navigation/NavigationFloatItem.cpp index b1166ba..1ca9e15 100644
--- a/src/plugins/render/navigation/NavigationFloatItem.cpp
+++ b/src/plugins/render/navigation/NavigationFloatItem.cpp
@@ -12,13 +12,13 @@
#include "NavigationFloatItem.h"
-#include <QtCore/qmath.h>
-#include <QtCore/QRect>
-#include <QtGui/QPixmap>
-#include <QtGui/QToolButton>
-#include <QtGui/QSlider>
-#include <QtGui/QWidget>
-#include <QtGui/QPainter>
+#include <qmath.h>
+#include <QRect>
+#include <QPixmap>
+#include <QToolButton>
+#include <QSlider>
+#include <QWidget>
+#include <QPainter>
#include <QPixmapCache>
#include "ui_navigation.h"
diff --git a/src/plugins/render/opencaching/OpenCachingItem.cpp \
b/src/plugins/render/opencaching/OpenCachingItem.cpp index a7ddcee..8991cd1 100644
--- a/src/plugins/render/opencaching/OpenCachingItem.cpp
+++ b/src/plugins/render/opencaching/OpenCachingItem.cpp
@@ -12,8 +12,8 @@
#include "GeoPainter.h"
#include "ViewportParams.h"
-#include <QtGui/QFontMetrics>
-#include <QtGui/QPixmap>
+#include <QFontMetrics>
+#include <QPixmap>
#include "ui_OpenCachingCacheDialog.h"
diff --git a/src/plugins/render/opencaching/OpenCachingModel.cpp \
b/src/plugins/render/opencaching/OpenCachingModel.cpp index f14476d..f382809 100644
--- a/src/plugins/render/opencaching/OpenCachingModel.cpp
+++ b/src/plugins/render/opencaching/OpenCachingModel.cpp
@@ -18,10 +18,10 @@
#include "MarbleDebug.h"
#include "OpenCachingCache.h"
-#include <QtCore/QDebug>
-#include <QtCore/QString>
-#include <QtCore/QUrl>
-#include <QtXml/QXmlStreamReader>
+#include <QDebug>
+#include <QString>
+#include <QUrl>
+#include <QXmlStreamReader>
namespace Marble {
diff --git a/src/plugins/render/opencaching/OpenCachingPlugin.cpp \
b/src/plugins/render/opencaching/OpenCachingPlugin.cpp index a24497d..dfe6bf0 100644
--- a/src/plugins/render/opencaching/OpenCachingPlugin.cpp
+++ b/src/plugins/render/opencaching/OpenCachingPlugin.cpp
@@ -12,7 +12,7 @@
#include "OpenCachingModel.h"
#include "ui_OpenCachingConfigWidget.h"
-#include <QtGui/QPushButton>
+#include <QPushButton>
namespace Marble {
diff --git a/src/plugins/render/opencachingcom/OpenCachingComItem.cpp \
b/src/plugins/render/opencachingcom/OpenCachingComItem.cpp index aea1996..c8cae68 \
100644
--- a/src/plugins/render/opencachingcom/OpenCachingComItem.cpp
+++ b/src/plugins/render/opencachingcom/OpenCachingComItem.cpp
@@ -20,14 +20,14 @@
#include "ui_CacheDetailsDialog.h"
#include "OpenCachingComModel.h"
-#include <QtGui/QFontMetrics>
-#include <QtGui/QPixmap>
+#include <QFontMetrics>
+#include <QPixmap>
#include <QAction>
#include <QDialog>
#include <QDateTime>
#include <QFile>
-#include <QtScript/QScriptEngine>
-#include <QtScript/QScriptValue>
+#include <QScriptEngine>
+#include <QScriptValue>
#include <QDesktopServices>
#include <QDebug>
diff --git a/src/plugins/render/opencachingcom/OpenCachingComModel.cpp \
b/src/plugins/render/opencachingcom/OpenCachingComModel.cpp index ee35912..067ffde \
100644
--- a/src/plugins/render/opencachingcom/OpenCachingComModel.cpp
+++ b/src/plugins/render/opencachingcom/OpenCachingComModel.cpp
@@ -16,11 +16,11 @@
#include "GeoDataCoordinates.h"
#include "MarbleDebug.h"
-#include <QtCore/QDebug>
-#include <QtCore/QString>
-#include <QtCore/QUrl>
-#include <QtScript/QScriptEngine>
-#include <QtScript/QScriptValue>
+#include <QDebug>
+#include <QString>
+#include <QUrl>
+#include <QScriptEngine>
+#include <QScriptValue>
namespace Marble {
diff --git a/src/plugins/render/opendesktop/OpenDesktopItem.cpp \
b/src/plugins/render/opendesktop/OpenDesktopItem.cpp index b089a47..e4214b5 100644
--- a/src/plugins/render/opendesktop/OpenDesktopItem.cpp
+++ b/src/plugins/render/opendesktop/OpenDesktopItem.cpp
@@ -9,7 +9,7 @@
// Copyright 2012 Illya Kovalevskyy <illya.kovalevskyy@gmail.com>
//
-#include <QtGui/QPainter>
+#include <QPainter>
#include "OpenDesktopItem.h"
#include "ViewportParams.h"
#include "layers/PopupLayer.h"
diff --git a/src/plugins/render/opendesktop/OpenDesktopModel.cpp \
b/src/plugins/render/opendesktop/OpenDesktopModel.cpp index 2b934cc..d80be3d 100644
--- a/src/plugins/render/opendesktop/OpenDesktopModel.cpp
+++ b/src/plugins/render/opendesktop/OpenDesktopModel.cpp
@@ -15,11 +15,11 @@
#include "MarbleGlobal.h"
#include "MarbleModel.h"
#include "GeoDataCoordinates.h"
-#include <QtCore/QString>
-#include <QtCore/QUrl>
-#include <QtScript/QScriptEngine>
-#include <QtScript/QScriptValue>
-#include <QtScript/QScriptValueIterator>
+#include <QString>
+#include <QUrl>
+#include <QScriptEngine>
+#include <QScriptValue>
+#include <QScriptValueIterator>
using namespace Marble;
diff --git a/src/plugins/render/opendesktop/OpenDesktopPlugin.cpp \
b/src/plugins/render/opendesktop/OpenDesktopPlugin.cpp index b1cef50..f54fd14 100644
--- a/src/plugins/render/opendesktop/OpenDesktopPlugin.cpp
+++ b/src/plugins/render/opendesktop/OpenDesktopPlugin.cpp
@@ -15,7 +15,7 @@
#include "ui_OpenDesktopConfigWidget.h"
-#include <QtGui/QPushButton>
+#include <QPushButton>
using namespace Marble;
diff --git a/src/plugins/render/overviewmap/OverviewMap.cpp \
b/src/plugins/render/overviewmap/OverviewMap.cpp index 2df8194..a88e568 100644
--- a/src/plugins/render/overviewmap/OverviewMap.cpp
+++ b/src/plugins/render/overviewmap/OverviewMap.cpp
@@ -10,16 +10,16 @@
#include "OverviewMap.h"
-#include <QtCore/QRect>
-#include <QtCore/QStringList>
-#include <QtGui/QCursor>
-#include <QtGui/QMouseEvent>
-#include <QtGui/QPainter>
-#include <QtGui/QPixmap>
-#include <QtGui/QFileDialog>
-#include <QtGui/QHBoxLayout>
-#include <QtSvg/QSvgRenderer>
-#include <QtGui/QColorDialog>
+#include <QRect>
+#include <QStringList>
+#include <QCursor>
+#include <QMouseEvent>
+#include <QPainter>
+#include <QPixmap>
+#include <QFileDialog>
+#include <QHBoxLayout>
+#include <QSvgRenderer>
+#include <QColorDialog>
#include "MarbleDirs.h"
#include "MarbleDebug.h"
diff --git a/src/plugins/render/panoramio/PanoramioModel.cpp \
b/src/plugins/render/panoramio/PanoramioModel.cpp index 29199ed..081951f 100644
--- a/src/plugins/render/panoramio/PanoramioModel.cpp
+++ b/src/plugins/render/panoramio/PanoramioModel.cpp
@@ -17,8 +17,8 @@
#include "PanoramioWidget.h"
// Qt
-#include <QtCore/QUrl>
-#include <QtCore/QString>
+#include <QUrl>
+#include <QString>
using namespace Marble;
diff --git a/src/plugins/render/photo/FlickrParser.cpp \
b/src/plugins/render/photo/FlickrParser.cpp index 1578bfa..23db3ad 100644
--- a/src/plugins/render/photo/FlickrParser.cpp
+++ b/src/plugins/render/photo/FlickrParser.cpp
@@ -16,7 +16,7 @@
#include "PhotoPluginItem.h"
// Qt
-#include <QtCore/QByteArray>
+#include <QByteArray>
using namespace Marble;
diff --git a/src/plugins/render/photo/PhotoPlugin.cpp \
b/src/plugins/render/photo/PhotoPlugin.cpp index cdb6243..acc7191 100644
--- a/src/plugins/render/photo/PhotoPlugin.cpp
+++ b/src/plugins/render/photo/PhotoPlugin.cpp
@@ -21,9 +21,9 @@
#include "MarbleWidget.h"
// Qt
-#include <QtGui/QPushButton>
-#include <QtGui/QLabel>
-#include <QtCore/QStringList>
+#include <QPushButton>
+#include <QLabel>
+#include <QStringList>
using namespace Marble;
/* TRANSLATOR Marble::PhotoPlugin */
diff --git a/src/plugins/render/photo/PhotoPluginItem.cpp \
b/src/plugins/render/photo/PhotoPluginItem.cpp index 92e94f2..d5e41b2 100644
--- a/src/plugins/render/photo/PhotoPluginItem.cpp
+++ b/src/plugins/render/photo/PhotoPluginItem.cpp
@@ -33,13 +33,13 @@
#include "layers/PopupLayer.h"
// Qt
-#include <QtGui/QAction>
-#include <QtGui/QIcon>
-#include <QtCore/QFile>
-#include <QtCore/QHash>
-#include <QtCore/QUrl>
-#include <QtGui/QMouseEvent>
-#include <QtGui/QPixmap>
+#include <QAction>
+#include <QIcon>
+#include <QFile>
+#include <QHash>
+#include <QUrl>
+#include <QMouseEvent>
+#include <QPixmap>
using namespace Marble;
diff --git a/src/plugins/render/photo/PhotoPluginModel.cpp \
b/src/plugins/render/photo/PhotoPluginModel.cpp index b35f8dc..744bc35 100644
--- a/src/plugins/render/photo/PhotoPluginModel.cpp
+++ b/src/plugins/render/photo/PhotoPluginModel.cpp
@@ -25,9 +25,9 @@
#include "MarbleWidget.h"
// Qt
-#include <QtCore/QHash>
-#include <QtCore/QString>
-#include <QtCore/QUrl>
+#include <QHash>
+#include <QString>
+#include <QUrl>
using namespace Marble;
diff --git a/src/plugins/render/positionmarker/PositionMarker.cpp \
b/src/plugins/render/positionmarker/PositionMarker.cpp index 4fea11b..3582e4b 100644
--- a/src/plugins/render/positionmarker/PositionMarker.cpp
+++ b/src/plugins/render/positionmarker/PositionMarker.cpp
@@ -14,12 +14,12 @@
#include "PositionMarker.h"
#include "MarbleDebug.h"
-#include <QtCore/QRect>
-#include <QtCore/qmath.h>
-#include <QtGui/QFileDialog>
-#include <QtGui/QPushButton>
-#include <QtGui/QColorDialog>
-#include <QtGui/QTransform>
+#include <QRect>
+#include <qmath.h>
+#include <QFileDialog>
+#include <QPushButton>
+#include <QColorDialog>
+#include <QTransform>
#include <cmath>
diff --git a/src/plugins/render/postalcode/PostalCodeItem.cpp \
b/src/plugins/render/postalcode/PostalCodeItem.cpp index 170b41f..677c98f 100644
--- a/src/plugins/render/postalcode/PostalCodeItem.cpp
+++ b/src/plugins/render/postalcode/PostalCodeItem.cpp
@@ -15,8 +15,8 @@
#include "ViewportParams.h"
// Qt
-#include <QtGui/QFontMetrics>
-#include <QtGui/QPainter>
+#include <QFontMetrics>
+#include <QPainter>
using namespace Marble;
diff --git a/src/plugins/render/postalcode/PostalCodeModel.cpp \
b/src/plugins/render/postalcode/PostalCodeModel.cpp index 389fe21..49acb18 100644
--- a/src/plugins/render/postalcode/PostalCodeModel.cpp
+++ b/src/plugins/render/postalcode/PostalCodeModel.cpp
@@ -23,11 +23,11 @@
#include "Planet.h"
// Qt
-#include <QtCore/QString>
-#include <QtCore/QUrl>
-#include <QtScript/QScriptEngine>
-#include <QtScript/QScriptValue>
-#include <QtScript/QScriptValueIterator>
+#include <QString>
+#include <QUrl>
+#include <QScriptEngine>
+#include <QScriptValue>
+#include <QScriptValueIterator>
using namespace Marble;
diff --git a/src/plugins/render/progress/ProgressFloatItem.cpp \
b/src/plugins/render/progress/ProgressFloatItem.cpp index ae27b76..96f98ef 100644
--- a/src/plugins/render/progress/ProgressFloatItem.cpp
+++ b/src/plugins/render/progress/ProgressFloatItem.cpp
@@ -18,11 +18,11 @@
#include "ViewportParams.h"
#include "HttpDownloadManager.h"
-#include <QtCore/QRect>
-#include <QtGui/QColor>
-#include <QtCore/QMutexLocker>
-#include <QtGui/QPaintDevice>
-#include <QtGui/QPainter>
+#include <QRect>
+#include <QColor>
+#include <QMutexLocker>
+#include <QPaintDevice>
+#include <QPainter>
namespace Marble
{
diff --git a/src/plugins/render/routing/AudioOutput.cpp \
b/src/plugins/render/routing/AudioOutput.cpp index 707fbc2..c254c33 100644
--- a/src/plugins/render/routing/AudioOutput.cpp
+++ b/src/plugins/render/routing/AudioOutput.cpp
@@ -14,7 +14,7 @@
#include "MarbleDebug.h"
#include "routing/VoiceNavigationModel.h"
-#include <QtCore/QDirIterator>
+#include <QDirIterator>
#include <phonon/MediaObject>
#include <phonon/MediaSource>
#include <phonon/AudioOutput>
diff --git a/src/plugins/render/routing/RoutingPlugin.cpp \
b/src/plugins/render/routing/RoutingPlugin.cpp index e1f2b65..1dc1918 100644
--- a/src/plugins/render/routing/RoutingPlugin.cpp
+++ b/src/plugins/render/routing/RoutingPlugin.cpp
@@ -33,16 +33,16 @@
#include "ViewportParams.h"
#include "WidgetGraphicsItem.h"
-#include <QtCore/QRect>
-#include <QtGui/QWidget>
-#include <QtGui/QToolButton>
-#include <QtGui/QFont>
-#include <QtGui/QActionGroup>
-#include <QtGui/QPixmap>
-#include <QtGui/QPlastiqueStyle>
-#include <QtGui/QDialog>
-#include <QtGui/QPushButton>
-#include <QtGui/QSpacerItem>
+#include <QRect>
+#include <QWidget>
+#include <QToolButton>
+#include <QFont>
+#include <QActionGroup>
+#include <QPixmap>
+#include <QPlastiqueStyle>
+#include <QDialog>
+#include <QPushButton>
+#include <QSpacerItem>
namespace Marble
{
diff --git a/src/plugins/render/satellites/SatellitesConfigAbstractItem.cpp \
b/src/plugins/render/satellites/SatellitesConfigAbstractItem.cpp index \
ab8af61..d8dede7 100644
--- a/src/plugins/render/satellites/SatellitesConfigAbstractItem.cpp
+++ b/src/plugins/render/satellites/SatellitesConfigAbstractItem.cpp
@@ -12,7 +12,7 @@
#include "MarbleDebug.h"
-#include <QtCore/QVariant>
+#include <QVariant>
namespace Marble {
diff --git a/src/plugins/render/satellites/SatellitesConfigLeafItem.cpp \
b/src/plugins/render/satellites/SatellitesConfigLeafItem.cpp index 5b2e879..779b152 \
100644
--- a/src/plugins/render/satellites/SatellitesConfigLeafItem.cpp
+++ b/src/plugins/render/satellites/SatellitesConfigLeafItem.cpp
@@ -10,7 +10,7 @@
#include "SatellitesConfigLeafItem.h"
-#include <QtCore/QVariant>
+#include <QVariant>
namespace Marble {
diff --git a/src/plugins/render/satellites/SatellitesConfigNodeItem.cpp \
b/src/plugins/render/satellites/SatellitesConfigNodeItem.cpp index 38b96bc..45741d9 \
100644
--- a/src/plugins/render/satellites/SatellitesConfigNodeItem.cpp
+++ b/src/plugins/render/satellites/SatellitesConfigNodeItem.cpp
@@ -11,8 +11,8 @@
#include "SatellitesConfigNodeItem.h"
-#include <QtCore/QStringList>
-#include <QtCore/QVariant>
+#include <QStringList>
+#include <QVariant>
#include "MarbleDebug.h"
diff --git a/src/plugins/render/satellites/SatellitesPlugin.cpp \
b/src/plugins/render/satellites/SatellitesPlugin.cpp index 922eaee..2ef3d51 100644
--- a/src/plugins/render/satellites/SatellitesPlugin.cpp
+++ b/src/plugins/render/satellites/SatellitesPlugin.cpp
@@ -23,8 +23,8 @@
#include "ui_SatellitesConfigDialog.h"
-#include <QtCore/QUrl>
-#include <QtGui/QPushButton>
+#include <QUrl>
+#include <QPushButton>
namespace Marble
{
diff --git a/src/plugins/render/satellites/SatellitesTLEItem.cpp \
b/src/plugins/render/satellites/SatellitesTLEItem.cpp index 26fcd49..45628ac 100644
--- a/src/plugins/render/satellites/SatellitesTLEItem.cpp
+++ b/src/plugins/render/satellites/SatellitesTLEItem.cpp
@@ -21,11 +21,11 @@
#include "sgp4/sgp4ext.h"
-#include <QtCore/QFile>
-#include <QtCore/QDateTime>
-#include <QtGui/QAction>
-#include <QtGui/QLabel>
-#include <QtGui/QVBoxLayout>
+#include <QFile>
+#include <QDateTime>
+#include <QAction>
+#include <QLabel>
+#include <QVBoxLayout>
#include <QColor>
#include <cmath>
diff --git a/src/plugins/render/satellites/TrackerPluginModel.cpp \
b/src/plugins/render/satellites/TrackerPluginModel.cpp index e9c3143..1d37bdb 100644
--- a/src/plugins/render/satellites/TrackerPluginModel.cpp
+++ b/src/plugins/render/satellites/TrackerPluginModel.cpp
@@ -20,7 +20,7 @@
#include "MarbleModel.h"
#include "TrackerPluginItem.h"
-#include <QtCore/QTimer>
+#include <QTimer>
namespace Marble
{
diff --git a/src/plugins/render/speedometer/Speedometer.cpp \
b/src/plugins/render/speedometer/Speedometer.cpp index 0c99c6e..d1e2bef 100644
--- a/src/plugins/render/speedometer/Speedometer.cpp
+++ b/src/plugins/render/speedometer/Speedometer.cpp
@@ -19,7 +19,7 @@
#include "MarbleGraphicsGridLayout.h"
#include "ViewportParams.h"
-#include <QtGui/QLCDNumber>
+#include <QLCDNumber>
namespace Marble
{
diff --git a/src/plugins/render/stars/StarsPlugin.cpp \
b/src/plugins/render/stars/StarsPlugin.cpp index d8d1a08..f1afdc4 100644
--- a/src/plugins/render/stars/StarsPlugin.cpp
+++ b/src/plugins/render/stars/StarsPlugin.cpp
@@ -12,13 +12,13 @@
#include "StarsPlugin.h"
#include "ui_StarsConfigWidget.h"
-#include <QtCore/QRectF>
-#include <QtCore/QSize>
-#include <QtCore/QDateTime>
-#include <QtGui/QRegion>
-#include <QtGui/QContextMenuEvent>
-#include <QtGui/QMenu>
-#include <QtGui/QColorDialog>
+#include <QRectF>
+#include <QSize>
+#include <QDateTime>
+#include <QRegion>
+#include <QContextMenuEvent>
+#include <QMenu>
+#include <QColorDialog>
#include "MarbleClock.h"
#include "MarbleDebug.h"
diff --git a/src/plugins/render/test/TestPlugin.cpp \
b/src/plugins/render/test/TestPlugin.cpp index 1f6b74b..5063c18 100644
--- a/src/plugins/render/test/TestPlugin.cpp
+++ b/src/plugins/render/test/TestPlugin.cpp
@@ -10,9 +10,9 @@
#include "TestPlugin.h"
-#include <QtGui/QColor>
-#include <QtGui/QPixmap>
-#include <QtGui/QRadialGradient>
+#include <QColor>
+#include <QPixmap>
+#include <QRadialGradient>
#include "MarbleDirs.h"
#include "GeoPainter.h"
#include "GeoDataCoordinates.h"
diff --git a/src/plugins/render/twitter/twitterPlugin.cpp \
b/src/plugins/render/twitter/twitterPlugin.cpp index 795ac3e..cebe081 100644
--- a/src/plugins/render/twitter/twitterPlugin.cpp
+++ b/src/plugins/render/twitter/twitterPlugin.cpp
@@ -10,9 +10,9 @@
#include "twitterPlugin.h"
-#include <QtGui/QColor>
-#include <QtGui/QPixmap>
-#include <QtGui/QRadialGradient>
+#include <QColor>
+#include <QPixmap>
+#include <QRadialGradient>
#include <QSize>
#include <QRegExp>
diff --git a/src/plugins/render/weather/BBCItemGetter.cpp \
b/src/plugins/render/weather/BBCItemGetter.cpp index bd84874..22b797c 100644
--- a/src/plugins/render/weather/BBCItemGetter.cpp
+++ b/src/plugins/render/weather/BBCItemGetter.cpp
@@ -15,8 +15,8 @@
#include "MarbleDebug.h"
// Qt
-#include <QtCore/QMutexLocker>
-#include <QtCore/QUrl>
+#include <QMutexLocker>
+#include <QUrl>
using namespace Marble;
diff --git a/src/plugins/render/weather/BBCParser.cpp \
b/src/plugins/render/weather/BBCParser.cpp index defe4b0..66a0957 100644
--- a/src/plugins/render/weather/BBCParser.cpp
+++ b/src/plugins/render/weather/BBCParser.cpp
@@ -18,11 +18,11 @@
#include "MarbleDebug.h"
// Qt
-#include <QtCore/QByteArray>
-#include <QtCore/QDateTime>
-#include <QtCore/QFile>
-#include <QtCore/QMutexLocker>
-#include <QtCore/QRegExp>
+#include <QByteArray>
+#include <QDateTime>
+#include <QFile>
+#include <QMutexLocker>
+#include <QRegExp>
using namespace Marble;
diff --git a/src/plugins/render/weather/BBCStation.cpp \
b/src/plugins/render/weather/BBCStation.cpp index 3dbeab8..eb9ae23 100644
--- a/src/plugins/render/weather/BBCStation.cpp
+++ b/src/plugins/render/weather/BBCStation.cpp
@@ -15,8 +15,8 @@
#include "GeoDataCoordinates.h"
// Qt
-#include <QtCore/QAtomicInt>
-#include <QtCore/QString>
+#include <QAtomicInt>
+#include <QString>
namespace Marble
{
diff --git a/src/plugins/render/weather/BBCWeatherItem.cpp \
b/src/plugins/render/weather/BBCWeatherItem.cpp index 99fc023..f1c640a 100644
--- a/src/plugins/render/weather/BBCWeatherItem.cpp
+++ b/src/plugins/render/weather/BBCWeatherItem.cpp
@@ -17,9 +17,9 @@
#include "MarbleDebug.h"
// Qt
-#include <QtCore/QFile>
-#include <QtCore/QTime>
-#include <QtCore/QUrl>
+#include <QFile>
+#include <QTime>
+#include <QUrl>
using namespace Marble;
/* TRANSLATOR Marble::BBCWeatherItem */
diff --git a/src/plugins/render/weather/BBCWeatherService.cpp \
b/src/plugins/render/weather/BBCWeatherService.cpp index b23a9be..97c34b3 100644
--- a/src/plugins/render/weather/BBCWeatherService.cpp
+++ b/src/plugins/render/weather/BBCWeatherService.cpp
@@ -25,10 +25,10 @@
#include "MarbleGlobal.h"
// Qt
-#include <QtCore/QFile>
-#include <QtCore/QList>
-#include <QtCore/QTime>
-#include <QtCore/QUrl>
+#include <QFile>
+#include <QList>
+#include <QTime>
+#include <QUrl>
using namespace Marble;
diff --git a/src/plugins/render/weather/GeoNamesWeatherService.cpp \
b/src/plugins/render/weather/GeoNamesWeatherService.cpp index 8e47dcf..ecbe56d 100644
--- a/src/plugins/render/weather/GeoNamesWeatherService.cpp
+++ b/src/plugins/render/weather/GeoNamesWeatherService.cpp
@@ -16,11 +16,11 @@
#include "MarbleModel.h"
#include "MarbleDebug.h"
-#include <QtCore/QUrl>
-#include <QtCore/QDateTime>
-#include <QtScript/QScriptEngine>
-#include <QtScript/QScriptValue>
-#include <QtScript/QScriptValueIterator>
+#include <QUrl>
+#include <QDateTime>
+#include <QScriptEngine>
+#include <QScriptValue>
+#include <QScriptValueIterator>
using namespace Marble;
diff --git a/src/plugins/render/weather/StationListParser.cpp \
b/src/plugins/render/weather/StationListParser.cpp index cfff5d7..a79fb2a 100644
--- a/src/plugins/render/weather/StationListParser.cpp
+++ b/src/plugins/render/weather/StationListParser.cpp
@@ -18,8 +18,8 @@
#include "MarbleDebug.h"
// Qt
-#include <QtCore/QFile>
-#include <QtCore/QString>
+#include <QFile>
+#include <QString>
using namespace Marble;
diff --git a/src/plugins/render/weather/WeatherData.cpp \
b/src/plugins/render/weather/WeatherData.cpp index 979b5f7..fa13ff3 100644
--- a/src/plugins/render/weather/WeatherData.cpp
+++ b/src/plugins/render/weather/WeatherData.cpp
@@ -17,12 +17,12 @@
#include "MarbleDebug.h"
// Qt
-#include <QtCore/QAtomicInt>
-#include <QtCore/QDate>
-#include <QtCore/QDateTime>
-#include <QtCore/QHash>
-#include <QtCore/QLocale>
-#include <QtGui/QImage>
+#include <QAtomicInt>
+#include <QDate>
+#include <QDateTime>
+#include <QHash>
+#include <QLocale>
+#include <QImage>
#include <cmath>
diff --git a/src/plugins/render/weather/WeatherItem.cpp \
b/src/plugins/render/weather/WeatherItem.cpp index 355ae5e..0631efa 100644
--- a/src/plugins/render/weather/WeatherItem.cpp
+++ b/src/plugins/render/weather/WeatherItem.cpp
@@ -27,17 +27,17 @@
#include "layers/PopupLayer.h"
// Qt
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDate>
-#include <QtCore/QHash>
-#include <QtCore/QObject>
-#include <QtCore/QString>
-#include <QtGui/QAction>
-#include <QtGui/QBrush>
-#include <QtGui/QIcon>
-#include <QtGui/QFontMetrics>
-#include <QtGui/QPushButton>
-#include <QtSvg/QSvgRenderer>
+#include <QCoreApplication>
+#include <QDate>
+#include <QHash>
+#include <QObject>
+#include <QString>
+#include <QAction>
+#include <QBrush>
+#include <QIcon>
+#include <QFontMetrics>
+#include <QPushButton>
+#include <QSvgRenderer>
namespace Marble
{
diff --git a/src/plugins/render/weather/WeatherModel.cpp \
b/src/plugins/render/weather/WeatherModel.cpp index cb78d17..ac54569 100644
--- a/src/plugins/render/weather/WeatherModel.cpp
+++ b/src/plugins/render/weather/WeatherModel.cpp
@@ -12,8 +12,8 @@
#include "WeatherModel.h"
// Qt
-#include <QtCore/QTimer>
-#include <QtCore/QUrl>
+#include <QTimer>
+#include <QUrl>
// Marble
#include "BBCWeatherService.h"
diff --git a/src/plugins/render/weather/WeatherPlugin.cpp \
b/src/plugins/render/weather/WeatherPlugin.cpp index 4be0c5d..bcaeeb2 100644
--- a/src/plugins/render/weather/WeatherPlugin.cpp
+++ b/src/plugins/render/weather/WeatherPlugin.cpp
@@ -22,10 +22,10 @@
#include "MarbleDebug.h"
// Qt
-#include <QtGui/QComboBox>
-#include <QtGui/QDialog>
-#include <QtGui/QIcon>
-#include <QtGui/QPushButton>
+#include <QComboBox>
+#include <QDialog>
+#include <QIcon>
+#include <QPushButton>
using namespace Marble;
/* TRANSLATOR Marble::WeatherPlugin */
diff --git a/src/plugins/render/wikipedia/GeonamesParser.cpp \
b/src/plugins/render/wikipedia/GeonamesParser.cpp index 266bda6..aa2a6d5 100644
--- a/src/plugins/render/wikipedia/GeonamesParser.cpp
+++ b/src/plugins/render/wikipedia/GeonamesParser.cpp
@@ -17,7 +17,7 @@
#include "MarbleDebug.h"
// Qt
-#include <QtCore/QByteArray>
+#include <QByteArray>
using namespace Marble;
diff --git a/src/plugins/render/wikipedia/WikipediaItem.cpp \
b/src/plugins/render/wikipedia/WikipediaItem.cpp index 44854ac..ea96dce 100644
--- a/src/plugins/render/wikipedia/WikipediaItem.cpp
+++ b/src/plugins/render/wikipedia/WikipediaItem.cpp
@@ -12,12 +12,12 @@
#include "WikipediaItem.h"
// Qt
-#include <QtGui/QAction>
-#include <QtGui/QIcon>
-#include <QtGui/QPainter>
-#include <QtGui/QPixmap>
-#include <QtGui/QMouseEvent>
-#include <QtWebKit/QWebView>
+#include <QAction>
+#include <QIcon>
+#include <QPainter>
+#include <QPixmap>
+#include <QMouseEvent>
+#include <QWebView>
// Marble
#include "MarbleDebug.h"
diff --git a/src/plugins/render/wikipedia/WikipediaModel.cpp \
b/src/plugins/render/wikipedia/WikipediaModel.cpp index e2d380c..c816980 100644
--- a/src/plugins/render/wikipedia/WikipediaModel.cpp
+++ b/src/plugins/render/wikipedia/WikipediaModel.cpp
@@ -25,13 +25,13 @@
#include "MarbleDebug.h"
// Qt
-#include <QtCore/QUrl>
-#include <QtCore/QString>
-#include <QtGui/QIcon>
-#include <QtGui/QImage>
-#include <QtGui/QPainter>
-#include <QtGui/QPixmap>
-#include <QtSvg/QSvgRenderer>
+#include <QUrl>
+#include <QString>
+#include <QIcon>
+#include <QImage>
+#include <QPainter>
+#include <QPixmap>
+#include <QSvgRenderer>
using namespace Marble;
diff --git a/src/plugins/render/wikipedia/WikipediaPlugin.cpp \
b/src/plugins/render/wikipedia/WikipediaPlugin.cpp index 89cf51e..ea8bc53 100644
--- a/src/plugins/render/wikipedia/WikipediaPlugin.cpp
+++ b/src/plugins/render/wikipedia/WikipediaPlugin.cpp
@@ -19,8 +19,8 @@
#include "MarbleWidget.h"
// Qt
-#include <QtGui/QPushButton>
-#include <QtGui/QLabel>
+#include <QPushButton>
+#include <QLabel>
using namespace Marble;
/* TRANSLATOR Marble::WikipediaPlugin */
diff --git a/src/plugins/runner/cache/CacheRunner.cpp \
b/src/plugins/runner/cache/CacheRunner.cpp index 30d5f02..ffcacba 100644
--- a/src/plugins/runner/cache/CacheRunner.cpp
+++ b/src/plugins/runner/cache/CacheRunner.cpp
@@ -13,7 +13,7 @@
#include "GeoDataExtendedData.h"
#include "GeoDataPlacemark.h"
-#include <QtCore/QFile>
+#include <QFile>
namespace Marble
{
diff --git a/src/plugins/runner/gosmore-reversegeocoding/GosmoreReverseGeocodingPlugin.cpp \
b/src/plugins/runner/gosmore-reversegeocoding/GosmoreReverseGeocodingPlugin.cpp index \
56a59da..f524d25 100644
--- a/src/plugins/runner/gosmore-reversegeocoding/GosmoreReverseGeocodingPlugin.cpp
+++ b/src/plugins/runner/gosmore-reversegeocoding/GosmoreReverseGeocodingPlugin.cpp
@@ -13,8 +13,8 @@
#include "GosmoreReverseGeocodingRunner.h"
#include "MarbleDirs.h"
-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
+#include <QDir>
+#include <QFileInfo>
namespace Marble
{
diff --git a/src/plugins/runner/gosmore-reversegeocoding/GosmoreReverseGeocodingRunner.cpp \
b/src/plugins/runner/gosmore-reversegeocoding/GosmoreReverseGeocodingRunner.cpp index \
4f0811b..8301281 100644
--- a/src/plugins/runner/gosmore-reversegeocoding/GosmoreReverseGeocodingRunner.cpp
+++ b/src/plugins/runner/gosmore-reversegeocoding/GosmoreReverseGeocodingRunner.cpp
@@ -19,8 +19,8 @@
#include "GeoDataDocument.h"
#include "GeoDataExtendedData.h"
-#include <QtCore/QProcess>
-#include <QtCore/QMap>
+#include <QProcess>
+#include <QMap>
namespace Marble
{
diff --git a/src/plugins/runner/gosmore-routing/GosmoreRoutingPlugin.cpp \
b/src/plugins/runner/gosmore-routing/GosmoreRoutingPlugin.cpp index eab31c1..5107660 \
100644
--- a/src/plugins/runner/gosmore-routing/GosmoreRoutingPlugin.cpp
+++ b/src/plugins/runner/gosmore-routing/GosmoreRoutingPlugin.cpp
@@ -13,8 +13,8 @@
#include "GosmoreRoutingRunner.h"
#include "MarbleDirs.h"
-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
+#include <QDir>
+#include <QFileInfo>
namespace Marble
{
diff --git a/src/plugins/runner/gosmore-routing/GosmoreRoutingRunner.cpp \
b/src/plugins/runner/gosmore-routing/GosmoreRoutingRunner.cpp index 41ae828..c7eaf70 \
100644
--- a/src/plugins/runner/gosmore-routing/GosmoreRoutingRunner.cpp
+++ b/src/plugins/runner/gosmore-routing/GosmoreRoutingRunner.cpp
@@ -19,8 +19,8 @@
#include "GeoDataDocument.h"
#include "GeoDataExtendedData.h"
-#include <QtCore/QProcess>
-#include <QtCore/QMap>
+#include <QProcess>
+#include <QMap>
namespace Marble
{
diff --git a/src/plugins/runner/gpx/GpxRunner.cpp \
b/src/plugins/runner/gpx/GpxRunner.cpp index c777942..de1d706 100644
--- a/src/plugins/runner/gpx/GpxRunner.cpp
+++ b/src/plugins/runner/gpx/GpxRunner.cpp
@@ -12,7 +12,7 @@
#include "GeoDataDocument.h"
#include "GpxParser.h"
-#include <QtCore/QFile>
+#include <QFile>
namespace Marble
{
diff --git a/src/plugins/runner/gpx/tests/TestTrack.cpp \
b/src/plugins/runner/gpx/tests/TestTrack.cpp index 2d622a8..c579217 100644
--- a/src/plugins/runner/gpx/tests/TestTrack.cpp
+++ b/src/plugins/runner/gpx/tests/TestTrack.cpp
@@ -8,8 +8,8 @@
// Copyright 2011 Niko Sams <niko.sams@gmail.com>
//
-#include <QtCore/QObject>
-#include <QtTest/QtTest>
+#include <QObject>
+#include <QtTest>
#include "GeoDataPoint.h"
#include "GeoDataLinearRing.h"
diff --git a/src/plugins/runner/hostip/HostipRunner.cpp \
b/src/plugins/runner/hostip/HostipRunner.cpp index e2f81ae..6c40d8b 100644
--- a/src/plugins/runner/hostip/HostipRunner.cpp
+++ b/src/plugins/runner/hostip/HostipRunner.cpp
@@ -14,11 +14,11 @@
#include "GeoDataFeature.h"
#include "GeoDataPlacemark.h"
-#include <QtCore/QString>
-#include <QtCore/QTimer>
-#include <QtCore/QVector>
-#include <QtCore/QUrl>
-#include <QtNetwork/QNetworkReply>
+#include <QString>
+#include <QTimer>
+#include <QVector>
+#include <QUrl>
+#include <QNetworkReply>
namespace Marble
{
diff --git a/src/plugins/runner/json/JsonRunner.cpp \
b/src/plugins/runner/json/JsonRunner.cpp index 2098e1f..e3ea7f2 100644
--- a/src/plugins/runner/json/JsonRunner.cpp
+++ b/src/plugins/runner/json/JsonRunner.cpp
@@ -14,7 +14,7 @@
#include "GeoDataDocument.h"
#include "MarbleDebug.h"
-#include <QtCore/QFile>
+#include <QFile>
#include <QFileInfo>
namespace Marble
diff --git a/src/plugins/runner/kml/KmlDocument.cpp \
b/src/plugins/runner/kml/KmlDocument.cpp index 98973cd..57e1b1f 100644
--- a/src/plugins/runner/kml/KmlDocument.cpp
+++ b/src/plugins/runner/kml/KmlDocument.cpp
@@ -11,8 +11,8 @@
#include "MarbleDebug.h"
-#include <QtCore/QFile>
-#include <QtCore/QDir>
+#include <QFile>
+#include <QDir>
namespace Marble
{
diff --git a/src/plugins/runner/kml/KmlRunner.cpp \
b/src/plugins/runner/kml/KmlRunner.cpp index 0258398..9769a52 100644
--- a/src/plugins/runner/kml/KmlRunner.cpp
+++ b/src/plugins/runner/kml/KmlRunner.cpp
@@ -18,8 +18,8 @@
#include "KmzHandler.h"
#endif
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
+#include <QFile>
+#include <QFileInfo>
namespace Marble
{
diff --git a/src/plugins/runner/kml/KmzHandler.cpp \
b/src/plugins/runner/kml/KmzHandler.cpp index 9ad16ce..c20754f 100644
--- a/src/plugins/runner/kml/KmzHandler.cpp
+++ b/src/plugins/runner/kml/KmzHandler.cpp
@@ -10,8 +10,8 @@
#include "KmzHandler.h"
#include "MarbleDebug.h"
-#include <QtCore/QTemporaryFile>
-#include <QtCore/QDir>
+#include <QTemporaryFile>
+#include <QDir>
#include <quazip/quazip.h>
#include <quazip/quazipfile.h>
diff --git a/src/plugins/runner/latlon/LatLonRunner.cpp \
b/src/plugins/runner/latlon/LatLonRunner.cpp index 7381e36..ef08b61 100644
--- a/src/plugins/runner/latlon/LatLonRunner.cpp
+++ b/src/plugins/runner/latlon/LatLonRunner.cpp
@@ -14,11 +14,11 @@
#include "GeoDataCoordinates.h"
#include "MarbleDebug.h"
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QVector>
+#include <QString>
+#include <QStringList>
+#include <QVector>
-#include <QtCore/QtDebug>
+#include <QtDebug>
namespace Marble
{
diff --git a/src/plugins/runner/local-osm-search/DatabaseQuery.cpp \
b/src/plugins/runner/local-osm-search/DatabaseQuery.cpp index 09d55f8..6295832 100644
--- a/src/plugins/runner/local-osm-search/DatabaseQuery.cpp
+++ b/src/plugins/runner/local-osm-search/DatabaseQuery.cpp
@@ -15,7 +15,7 @@
#include "MarbleModel.h"
#include "PositionTracking.h"
-#include <QtCore/QMap>
+#include <QMap>
namespace Marble
{
diff --git a/src/plugins/runner/local-osm-search/LocalOsmSearchPlugin.cpp \
b/src/plugins/runner/local-osm-search/LocalOsmSearchPlugin.cpp index 70cec74..c82d441 \
100644
--- a/src/plugins/runner/local-osm-search/LocalOsmSearchPlugin.cpp
+++ b/src/plugins/runner/local-osm-search/LocalOsmSearchPlugin.cpp
@@ -13,7 +13,7 @@
#include "LocalOsmSearchRunner.h"
#include "MarbleDirs.h"
-#include <QtCore/QDirIterator>
+#include <QDirIterator>
namespace Marble
{
diff --git a/src/plugins/runner/local-osm-search/LocalOsmSearchRunner.cpp \
b/src/plugins/runner/local-osm-search/LocalOsmSearchRunner.cpp index 45785d6..7f466f8 \
100644
--- a/src/plugins/runner/local-osm-search/LocalOsmSearchRunner.cpp
+++ b/src/plugins/runner/local-osm-search/LocalOsmSearchRunner.cpp
@@ -16,9 +16,9 @@
#include "GeoDataDocument.h"
#include "GeoDataPlacemark.h"
-#include <QtCore/QString>
-#include <QtCore/QVector>
-#include <QtCore/QUrl>
+#include <QString>
+#include <QVector>
+#include <QUrl>
namespace Marble
{
diff --git a/src/plugins/runner/local-osm-search/OsmDatabase.cpp \
b/src/plugins/runner/local-osm-search/OsmDatabase.cpp index 60ad83f..47f50b6 100644
--- a/src/plugins/runner/local-osm-search/OsmDatabase.cpp
+++ b/src/plugins/runner/local-osm-search/OsmDatabase.cpp
@@ -19,16 +19,16 @@
#include "MarbleModel.h"
#include "PositionTracking.h"
-#include <QtCore/QFile>
-#include <QtCore/QDataStream>
-#include <QtCore/QStringList>
-#include <QtCore/QRegExp>
-#include <QtCore/QVariant>
-#include <QtCore/QTime>
-
-#include <QtSql/QSqlDatabase>
-#include <QtSql/QSqlQuery>
-#include <QtSql/QSqlError>
+#include <QFile>
+#include <QDataStream>
+#include <QStringList>
+#include <QRegExp>
+#include <QVariant>
+#include <QTime>
+
+#include <QSqlDatabase>
+#include <QSqlQuery>
+#include <QSqlError>
namespace Marble {
diff --git a/src/plugins/runner/localdatabase/LocalDatabaseRunner.cpp \
b/src/plugins/runner/localdatabase/LocalDatabaseRunner.cpp index 7073bcc..ff5ff61 \
100644
--- a/src/plugins/runner/localdatabase/LocalDatabaseRunner.cpp
+++ b/src/plugins/runner/localdatabase/LocalDatabaseRunner.cpp
@@ -18,11 +18,11 @@
#include "GeoDataCoordinates.h"
#include "MarbleDebug.h"
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QVector>
+#include <QString>
+#include <QStringList>
+#include <QVector>
-#include <QtCore/QtDebug>
+#include <QtDebug>
namespace Marble
{
diff --git a/src/plugins/runner/log/LogRunner.cpp \
b/src/plugins/runner/log/LogRunner.cpp index 6b7973a..436537e 100644
--- a/src/plugins/runner/log/LogRunner.cpp
+++ b/src/plugins/runner/log/LogRunner.cpp
@@ -14,8 +14,8 @@
#include "GeoDataPlacemark.h"
#include "MarbleDebug.h"
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
+#include <QFile>
+#include <QFileInfo>
namespace Marble
{
diff --git a/src/plugins/runner/mapquest/MapQuestRunner.cpp \
b/src/plugins/runner/mapquest/MapQuestRunner.cpp index 5c57df5..efcbd90 100644
--- a/src/plugins/runner/mapquest/MapQuestRunner.cpp
+++ b/src/plugins/runner/mapquest/MapQuestRunner.cpp
@@ -19,13 +19,13 @@
#include "routing/Maneuver.h"
#include "routing/RouteRequest.h"
-#include <QtCore/QString>
-#include <QtCore/QVector>
-#include <QtCore/QUrl>
-#include <QtCore/QTime>
-#include <QtCore/QTimer>
-#include <QtNetwork/QNetworkReply>
-#include <QtXml/QDomDocument>
+#include <QString>
+#include <QVector>
+#include <QUrl>
+#include <QTime>
+#include <QTimer>
+#include <QNetworkReply>
+#include <QDomDocument>
namespace Marble
{
diff --git a/src/plugins/runner/monav/MonavConfigWidget.cpp \
b/src/plugins/runner/monav/MonavConfigWidget.cpp index 8b17084..9a220d8 100644
--- a/src/plugins/runner/monav/MonavConfigWidget.cpp
+++ b/src/plugins/runner/monav/MonavConfigWidget.cpp
@@ -15,18 +15,18 @@
#include "MarbleDirs.h"
#include "MarbleDebug.h"
-#include <QtCore/QFile>
-#include <QtCore/QProcess>
-#include <QtCore/QSignalMapper>
-#include <QtGui/QStringListModel>
-#include <QtGui/QComboBox>
-#include <QtGui/QPushButton>
-#include <QtGui/QShowEvent>
-#include <QtGui/QSortFilterProxyModel>
-#include <QtGui/QMessageBox>
-#include <QtNetwork/QNetworkAccessManager>
-#include <QtNetwork/QNetworkReply>
-#include <QtXml/QDomDocument>
+#include <QFile>
+#include <QProcess>
+#include <QSignalMapper>
+#include <QStringListModel>
+#include <QComboBox>
+#include <QPushButton>
+#include <QShowEvent>
+#include <QSortFilterProxyModel>
+#include <QMessageBox>
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
+#include <QDomDocument>
namespace Marble
{
diff --git a/src/plugins/runner/monav/MonavMapsModel.cpp \
b/src/plugins/runner/monav/MonavMapsModel.cpp index ed3d328..9af5f40 100644
--- a/src/plugins/runner/monav/MonavMapsModel.cpp
+++ b/src/plugins/runner/monav/MonavMapsModel.cpp
@@ -10,7 +10,7 @@
#include "MonavMapsModel.h"
-#include <QtCore/QDate>
+#include <QDate>
namespace Marble
{
diff --git a/src/plugins/runner/monav/MonavPlugin.cpp \
b/src/plugins/runner/monav/MonavPlugin.cpp index 507efb6..6515523 100644
--- a/src/plugins/runner/monav/MonavPlugin.cpp
+++ b/src/plugins/runner/monav/MonavPlugin.cpp
@@ -24,12 +24,12 @@
#include "GeoDataExtendedData.h"
#include "routing/RouteRequest.h"
-#include <QtCore/QProcess>
-#include <QtCore/QDirIterator>
-#include <QtCore/QTimer>
-#include <QtNetwork/QLocalSocket>
-#include <QtCore/QThread>
-#include <QtCore/QTextStream>
+#include <QProcess>
+#include <QDirIterator>
+#include <QTimer>
+#include <QLocalSocket>
+#include <QThread>
+#include <QTextStream>
namespace Marble
{
diff --git a/src/plugins/runner/monav/MonavRunner.cpp \
b/src/plugins/runner/monav/MonavRunner.cpp index 3b6a86c..8db2eb4 100644
--- a/src/plugins/runner/monav/MonavRunner.cpp
+++ b/src/plugins/runner/monav/MonavRunner.cpp
@@ -20,9 +20,9 @@
#include "GeoDataData.h"
#include "GeoDataExtendedData.h"
-#include <QtCore/QProcess>
-#include <QtCore/QTime>
-#include <QtNetwork/QLocalSocket>
+#include <QProcess>
+#include <QTime>
+#include <QLocalSocket>
using namespace MoNav;
diff --git a/src/plugins/runner/nominatim-reversegeocoding/OsmNominatimReverseGeocodingRunner.cpp \
b/src/plugins/runner/nominatim-reversegeocoding/OsmNominatimReverseGeocodingRunner.cpp
index 73b7298..708fee2 100644
--- a/src/plugins/runner/nominatim-reversegeocoding/OsmNominatimReverseGeocodingRunner.cpp
+++ b/src/plugins/runner/nominatim-reversegeocoding/OsmNominatimReverseGeocodingRunner.cpp
@@ -17,13 +17,13 @@
#include "GeoDataExtendedData.h"
#include "TinyWebBrowser.h"
-#include <QtCore/QString>
-#include <QtCore/QVector>
-#include <QtCore/QUrl>
-#include <QtCore/QTimer>
-#include <QtNetwork/QNetworkAccessManager>
-#include <QtNetwork/QNetworkReply>
-#include <QtXml/QDomDocument>
+#include <QString>
+#include <QVector>
+#include <QUrl>
+#include <QTimer>
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
+#include <QDomDocument>
namespace Marble
{
diff --git a/src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.cpp \
b/src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.cpp index \
251a734..af0c913 100644
--- a/src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.cpp
+++ b/src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.cpp
@@ -17,13 +17,13 @@
#include "GeoDataExtendedData.h"
#include "TinyWebBrowser.h"
-#include <QtCore/QString>
-#include <QtCore/QVector>
-#include <QtCore/QUrl>
-#include <QtCore/QTimer>
-#include <QtNetwork/QNetworkAccessManager>
-#include <QtNetwork/QNetworkReply>
-#include <QtXml/QDomDocument>
+#include <QString>
+#include <QVector>
+#include <QUrl>
+#include <QTimer>
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
+#include <QDomDocument>
namespace Marble
{
diff --git a/src/plugins/runner/open-source-routing-machine/OSRMRunner.cpp \
b/src/plugins/runner/open-source-routing-machine/OSRMRunner.cpp index \
8359058..a29536f 100644
--- a/src/plugins/runner/open-source-routing-machine/OSRMRunner.cpp
+++ b/src/plugins/runner/open-source-routing-machine/OSRMRunner.cpp
@@ -19,16 +19,16 @@
#include "routing/RouteRequest.h"
#include "TinyWebBrowser.h"
-#include <QtCore/QString>
-#include <QtCore/QVector>
-#include <QtCore/QUrl>
-#include <QtCore/QTime>
-#include <QtCore/QTimer>
-#include <QtNetwork/QNetworkAccessManager>
-#include <QtNetwork/QNetworkReply>
-#include <QtScript/QScriptValue>
-#include <QtScript/QScriptEngine>
-#include <QtScript/QScriptValueIterator>
+#include <QString>
+#include <QVector>
+#include <QUrl>
+#include <QTime>
+#include <QTimer>
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
+#include <QScriptValue>
+#include <QScriptEngine>
+#include <QScriptValueIterator>
namespace Marble
{
diff --git a/src/plugins/runner/openrouteservice/OpenRouteServiceRunner.cpp \
b/src/plugins/runner/openrouteservice/OpenRouteServiceRunner.cpp index \
126be5e..56af1dc 100644
--- a/src/plugins/runner/openrouteservice/OpenRouteServiceRunner.cpp
+++ b/src/plugins/runner/openrouteservice/OpenRouteServiceRunner.cpp
@@ -18,13 +18,13 @@
#include "GeoDataExtendedData.h"
#include "routing/RouteRequest.h"
-#include <QtCore/QString>
-#include <QtCore/QVector>
-#include <QtCore/QUrl>
-#include <QtCore/QTime>
-#include <QtCore/QTimer>
-#include <QtNetwork/QNetworkReply>
-#include <QtXml/QDomDocument>
+#include <QString>
+#include <QVector>
+#include <QUrl>
+#include <QTime>
+#include <QTimer>
+#include <QNetworkReply>
+#include <QDomDocument>
namespace Marble
{
diff --git a/src/plugins/runner/osm/OsmRunner.cpp \
b/src/plugins/runner/osm/OsmRunner.cpp index 97d551c..22b1e9b 100644
--- a/src/plugins/runner/osm/OsmRunner.cpp
+++ b/src/plugins/runner/osm/OsmRunner.cpp
@@ -12,7 +12,7 @@
#include "GeoDataDocument.h"
#include "OsmParser.h"
-#include <QtCore/QFile>
+#include <QFile>
namespace Marble
{
diff --git a/src/plugins/runner/osm/handlers/OsmBoundTagHandler.cpp \
b/src/plugins/runner/osm/handlers/OsmBoundTagHandler.cpp index 0dca507..ee84d22 \
100644
--- a/src/plugins/runner/osm/handlers/OsmBoundTagHandler.cpp
+++ b/src/plugins/runner/osm/handlers/OsmBoundTagHandler.cpp
@@ -16,7 +16,7 @@
#include "MarbleDebug.h"
#include "OsmElementDictionary.h"
-#include <QtCore/QStringList>
+#include <QStringList>
namespace Marble
{
diff --git a/src/plugins/runner/pn2/Pn2Runner.cpp \
b/src/plugins/runner/pn2/Pn2Runner.cpp index 5ec188f..877abe1 100644
--- a/src/plugins/runner/pn2/Pn2Runner.cpp
+++ b/src/plugins/runner/pn2/Pn2Runner.cpp
@@ -38,8 +38,8 @@
#include "GeoDataPlacemark.h"
#include "MarbleDebug.h"
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
+#include <QFile>
+#include <QFileInfo>
namespace Marble
{
diff --git a/src/plugins/runner/pnt/PntRunner.cpp \
b/src/plugins/runner/pnt/PntRunner.cpp index 9aa132c..bc3a068 100644
--- a/src/plugins/runner/pnt/PntRunner.cpp
+++ b/src/plugins/runner/pnt/PntRunner.cpp
@@ -16,9 +16,9 @@
#include "MarbleDebug.h"
#include "MarbleGlobal.h"
-#include <QtCore/qmath.h>
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
+#include <qmath.h>
+#include <QFile>
+#include <QFileInfo>
namespace Marble
{
diff --git a/src/plugins/runner/routino/RoutinoRunner.cpp \
b/src/plugins/runner/routino/RoutinoRunner.cpp index 0066893..4186349 100644
--- a/src/plugins/runner/routino/RoutinoRunner.cpp
+++ b/src/plugins/runner/routino/RoutinoRunner.cpp
@@ -19,9 +19,9 @@
#include "GeoDataDocument.h"
#include "GeoDataExtendedData.h"
-#include <QtCore/QProcess>
-#include <QtCore/QMap>
-#include <QtCore/QTemporaryFile>
+#include <QProcess>
+#include <QMap>
+#include <QTemporaryFile>
#include <MarbleMap.h>
#include <MarbleModel.h>
#include <routing/RoutingManager.h>
diff --git a/src/plugins/runner/shp/ShpRunner.cpp \
b/src/plugins/runner/shp/ShpRunner.cpp index 2468d0b..6081cdc 100644
--- a/src/plugins/runner/shp/ShpRunner.cpp
+++ b/src/plugins/runner/shp/ShpRunner.cpp
@@ -14,7 +14,7 @@
#include "GeoDataPolygon.h"
#include "MarbleDebug.h"
-#include <QtCore/QFileInfo>
+#include <QFileInfo>
#include <shapefil.h>
diff --git a/src/plugins/runner/traveling-salesman/TravelingSalesmanRunner.cpp \
b/src/plugins/runner/traveling-salesman/TravelingSalesmanRunner.cpp index \
d43d5af..71bbb16 100644
--- a/src/plugins/runner/traveling-salesman/TravelingSalesmanRunner.cpp
+++ b/src/plugins/runner/traveling-salesman/TravelingSalesmanRunner.cpp
@@ -16,9 +16,9 @@
#include "GeoDataDocument.h"
#include "GeoDataParser.h"
-#include <QtCore/QProcess>
-#include <QtCore/QMap>
-#include <QtCore/QTemporaryFile>
+#include <QProcess>
+#include <QMap>
+#include <QTemporaryFile>
namespace Marble
{
diff --git a/src/plugins/runner/yours/YoursRunner.cpp \
b/src/plugins/runner/yours/YoursRunner.cpp index cda7e1f..72f7e8d 100644
--- a/src/plugins/runner/yours/YoursRunner.cpp
+++ b/src/plugins/runner/yours/YoursRunner.cpp
@@ -19,15 +19,15 @@
#include "GeoDataFolder.h"
#include "routing/RouteRequest.h"
-#include <QtCore/QString>
-#include <QtCore/QVector>
-#include <QtCore/QUrl>
-#include <QtCore/QTime>
-#include <QtNetwork/QNetworkAccessManager>
-#include <QtNetwork/QNetworkReply>
-#include <QtXml/QDomDocument>
-#include <QtCore/QBuffer>
-#include <QtCore/QTimer>
+#include <QString>
+#include <QVector>
+#include <QUrl>
+#include <QTime>
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
+#include <QDomDocument>
+#include <QBuffer>
+#include <QTimer>
namespace Marble
{
diff --git a/src/plugins/templates/floatitem/FITemplateFloatItem.cpp \
b/src/plugins/templates/floatitem/FITemplateFloatItem.cpp index ce8ec16..6fba884 \
100644
--- a/src/plugins/templates/floatitem/FITemplateFloatItem.cpp
+++ b/src/plugins/templates/floatitem/FITemplateFloatItem.cpp
@@ -13,10 +13,10 @@
#include "FITemplateFloatItem.h"
// Qt
-#include <QtCore/QRect>
-#include <QtGui/QColor>
-#include <QtGui/QPixmap>
-#include <QtSvg/QSvgRenderer>
+#include <QRect>
+#include <QColor>
+#include <QPixmap>
+#include <QSvgRenderer>
// Marble
#include "MarbleDebug.h"
diff --git a/src/qt-components/marble-touch/main.cpp \
b/src/qt-components/marble-touch/main.cpp index 0d5bb44..556c4f6 100644
--- a/src/qt-components/marble-touch/main.cpp
+++ b/src/qt-components/marble-touch/main.cpp
@@ -8,8 +8,8 @@
// A QML-interface of Marble for the Meego operating system.
-#include <QtGui/QApplication>
-#include <QtDeclarative/QtDeclarative>
+#include <QApplication>
+#include <QtDeclarative>
#include "MarbleDebug.h"
#include "MarbleGlobal.h"
diff --git a/src/qtmain.cpp b/src/qtmain.cpp
index 7599214..94f4048 100644
--- a/src/qtmain.cpp
+++ b/src/qtmain.cpp
@@ -9,13 +9,13 @@
// Copyright 2007 Inge Wallin <ingwa@kde.org>
//
-#include <QtGui/QApplication>
-#include <QtCore/QFile>
-#include <QtCore/QDir>
-#include <QtCore/QLocale>
-#include <QtCore/QSettings>
-#include <QtCore/QTranslator>
-#include <QtCore/QProcessEnvironment>
+#include <QApplication>
+#include <QFile>
+#include <QDir>
+#include <QLocale>
+#include <QSettings>
+#include <QTranslator>
+#include <QProcessEnvironment>
#include "QtMainWindow.h"
@@ -25,7 +25,7 @@
#include "MarbleLocale.h"
#ifdef STATIC_BUILD
- #include <QtCore/QtPlugin>
+ #include <QtPlugin>
Q_IMPORT_PLUGIN(qjpeg)
Q_IMPORT_PLUGIN(qsvg)
#endif
diff --git a/src/routing-instructions/main.cpp b/src/routing-instructions/main.cpp
index 6f437e0..5875821 100644
--- a/src/routing-instructions/main.cpp
+++ b/src/routing-instructions/main.cpp
@@ -12,14 +12,14 @@
#include "routing/instructions/InstructionTransformation.h"
#include "routing/instructions/RoutingInstruction.h"
-#include <QtCore/QCoreApplication>
-#include <QtCore/QLocale>
-#include <QtCore/QFile>
-#include <QtCore/QTextStream>
-#include <QtCore/QTranslator>
-#include <QtCore/QStringList>
-#include <QtCore/QFileInfo>
-#include <QtCore/QDir>
+#include <QCoreApplication>
+#include <QLocale>
+#include <QFile>
+#include <QTextStream>
+#include <QTranslator>
+#include <QStringList>
+#include <QFileInfo>
+#include <QDir>
using namespace Marble;
diff --git a/tests/AbstractDataPluginModelTest.cpp \
b/tests/AbstractDataPluginModelTest.cpp index cab6ad0..acdba8f 100644
--- a/tests/AbstractDataPluginModelTest.cpp
+++ b/tests/AbstractDataPluginModelTest.cpp
@@ -8,7 +8,7 @@
// Copyright 2013 Bernhard Beschow <bbeschow@cs.tu-berlin.de>
//
-#include <QtTest/QtTest>
+#include <QtTest>
#include "TestUtils.h"
#include "AbstractDataPluginModel.h"
diff --git a/tests/AbstractDataPluginTest.cpp b/tests/AbstractDataPluginTest.cpp
index e07c358..a91ed2c 100644
--- a/tests/AbstractDataPluginTest.cpp
+++ b/tests/AbstractDataPluginTest.cpp
@@ -8,7 +8,7 @@
// Copyright 2012 Bernhard Beschow <bbeschow@cs.tu-berlin.de>
//
-#include <QtTest/QtTest>
+#include <QtTest>
#include "MarbleModel.h"
#include "PluginManager.h"
diff --git a/tests/AbstractFloatItemTest.cpp b/tests/AbstractFloatItemTest.cpp
index 1941fa5..34bfbac 100644
--- a/tests/AbstractFloatItemTest.cpp
+++ b/tests/AbstractFloatItemTest.cpp
@@ -8,8 +8,8 @@
// Copyright 2013 Bernhard Beschow <bbeschow@cs.tu-berlin.de>
//
-#include <QtTest/QtTest>
-#include <QtCore/qmetatype.h>
+#include <QtTest>
+#include <qmetatype.h>
#include "MarbleModel.h"
#include "PluginManager.h"
diff --git a/tests/BookmarkManagerTest.cpp b/tests/BookmarkManagerTest.cpp
index 74f11d3..a7b3673 100644
--- a/tests/BookmarkManagerTest.cpp
+++ b/tests/BookmarkManagerTest.cpp
@@ -8,8 +8,8 @@
// Copyright 2012 Bernhard Beschow <bbeschow@cs.tu-berlin.de>
//
-#include <QtTest/QtTest>
-#include <QtTest/QSignalSpy>
+#include <QtTest>
+#include <QSignalSpy>
#include "BookmarkManager.h"
#include "GeoDataFolder.h"
diff --git a/tests/FrameGraphicsItemTest.cpp b/tests/FrameGraphicsItemTest.cpp
index 7cc0ade..fdc4955 100644
--- a/tests/FrameGraphicsItemTest.cpp
+++ b/tests/FrameGraphicsItemTest.cpp
@@ -8,7 +8,7 @@
// Copyright 2012 Bernhard Beschow <bbeschow@cs.tu-berlin.de>
//
-#include <QtTest/QtTest>
+#include <QtTest>
#include "FrameGraphicsItem.h"
diff --git a/tests/GeoDataLatLonAltBoxTest.cpp b/tests/GeoDataLatLonAltBoxTest.cpp
index 4a8e029..8092a2e 100644
--- a/tests/GeoDataLatLonAltBoxTest.cpp
+++ b/tests/GeoDataLatLonAltBoxTest.cpp
@@ -8,8 +8,8 @@
// Copyright 2009 Bastian Holst <bastianholst@gmx.de>
//
-#include <QtCore/QObject>
-#include <QtTest/QtTest>
+#include <QObject>
+#include <QtTest>
#include "GeoDataCoordinates.h"
#include "GeoDataLinearRing.h"
diff --git a/tests/GeoPolygonTest.cpp b/tests/GeoPolygonTest.cpp
index 1f68f84..df75c33 100644
--- a/tests/GeoPolygonTest.cpp
+++ b/tests/GeoPolygonTest.cpp
@@ -10,10 +10,10 @@
// Copyright 2007 Tim Sutton <tim@linfiniti.com>
//
-#include <QtGui/QtGui> //needed because this is a gui test
-#include <QtTest/QtTest>
-#include <QtCore/QtCore>
-#include <QtCore/QTime>
+#include <QtGui> //needed because this is a gui test
+#include <QtTest>
+#include <QtCore>
+#include <QTime>
#include "GeoPolygon.h"
diff --git a/tests/MapViewWidgetTest.cpp b/tests/MapViewWidgetTest.cpp
index de9fb97..5148ce2 100644
--- a/tests/MapViewWidgetTest.cpp
+++ b/tests/MapViewWidgetTest.cpp
@@ -8,8 +8,8 @@
// Copyright 2011 Bernhard Beschow <bbeschow@cs.tu-berlin.de>
//
-#include <QtTest/QtTest>
-#include <QtTest/QSignalSpy>
+#include <QtTest>
+#include <QSignalSpy>
#include "MapViewWidget.h"
#include "TestUtils.h"
diff --git a/tests/MarbleMapTest.cpp b/tests/MarbleMapTest.cpp
index 1e03caf..d40e2c2 100644
--- a/tests/MarbleMapTest.cpp
+++ b/tests/MarbleMapTest.cpp
@@ -8,7 +8,7 @@
// Copyright 2011 Bernhard Beschow <bbeschow@cs.tu-berlin.de>
//
-#include <QtTest/QtTest>
+#include <QtTest>
#include "GeoPainter.h"
#include "MarbleMap.h"
#include "MarbleModel.h"
diff --git a/tests/MarbleRunnerManagerTest.cpp b/tests/MarbleRunnerManagerTest.cpp
index 02e370c..daa7dbd 100644
--- a/tests/MarbleRunnerManagerTest.cpp
+++ b/tests/MarbleRunnerManagerTest.cpp
@@ -9,9 +9,9 @@
// Copyright 2012 Bernhard Beschow <bbeschow@cs.tu-berlin.de>
//
-#include <QtTest/QtTest>
-#include <QtTest/QSignalSpy>
-#include <QtCore/QMetaType>
+#include <QtTest>
+#include <QSignalSpy>
+#include <QMetaType>
#include "MarbleDebug.h"
#include "MarbleDirs.h"
diff --git a/tests/MarbleWidgetSpeedTest.cpp b/tests/MarbleWidgetSpeedTest.cpp
index 4d4561a..e1b4848 100644
--- a/tests/MarbleWidgetSpeedTest.cpp
+++ b/tests/MarbleWidgetSpeedTest.cpp
@@ -10,10 +10,10 @@
// Copyright 2007 Tim Sutton <tim@linfiniti.com>
//
-#include <QtGui/QtGui> //needed because this is a gui test
-#include <QtTest/QtTest>
-#include <QtCore/QtCore>
-#include <QtCore/QTime>
+#include <QtGui> //needed because this is a gui test
+#include <QtTest>
+#include <QtCore>
+#include <QTime>
#include "MarbleDirs.h"
#include "MarbleWidget.h"
diff --git a/tests/MarbleWidgetTest.cpp b/tests/MarbleWidgetTest.cpp
index f5e1af3..22fc19d 100644
--- a/tests/MarbleWidgetTest.cpp
+++ b/tests/MarbleWidgetTest.cpp
@@ -8,9 +8,9 @@
// Copyright 2008 Patrick Spendrin <ps_ml@gmx.de>
//
-#include <QtGui/QtGui>
-#include <QtTest/QtTest>
-#include <QtTest/QTestEvent>
+#include <QtGui>
+#include <QtTest>
+#include <QTestEvent>
#include "MarbleDirs.h"
#include "MarbleWidget.h"
#include "TestUtils.h"
diff --git a/tests/MercatorProjectionTest.cpp b/tests/MercatorProjectionTest.cpp
index 84fd8d6..11cfa32 100644
--- a/tests/MercatorProjectionTest.cpp
+++ b/tests/MercatorProjectionTest.cpp
@@ -8,7 +8,7 @@
// Copyright 2011 Bernhard Beschow <bbeschow@cs.tu-berlin.de>
//
-#include <QtTest/QtTest>
+#include <QtTest>
#include "MercatorProjection.h"
#include "ViewportParams.h"
#include "TestUtils.h"
diff --git a/tests/PlacemarkPositionProviderPluginTest.cpp \
b/tests/PlacemarkPositionProviderPluginTest.cpp index 0b1bbb7..1b6e999 100644
--- a/tests/PlacemarkPositionProviderPluginTest.cpp
+++ b/tests/PlacemarkPositionProviderPluginTest.cpp
@@ -8,7 +8,7 @@
// Copyright 2012 Bernhard Beschow <bbeschow@cs.tu-berlin.de>
//
-#include <QtTest/QtTest>
+#include <QtTest>
#include "GeoDataTrack.h"
#include "GeoDataPlacemark.h"
#include "PositionProviderPlugin.h"
diff --git a/tests/PluginManagerTest.cpp b/tests/PluginManagerTest.cpp
index 26a3126..0e76ace 100644
--- a/tests/PluginManagerTest.cpp
+++ b/tests/PluginManagerTest.cpp
@@ -8,7 +8,7 @@
// Copyright 2008 Patrick Spendrin <ps_ml@gmx.de>
//
-#include <QtTest/QtTest>
+#include <QtTest>
#include "MarbleDirs.h"
#include "PluginManager.h"
diff --git a/tests/PositionTrackingTest.cpp b/tests/PositionTrackingTest.cpp
index faecbae..4e37f1c 100644
--- a/tests/PositionTrackingTest.cpp
+++ b/tests/PositionTrackingTest.cpp
@@ -8,7 +8,7 @@
// Copyright 2012 Bernhard Beschow <bbeschow@cs.tu-berlin.de>
//
-#include <QtTest/QtTest>
+#include <QtTest>
#include "GeoDataTreeModel.h"
#include "PositionProviderPlugin.h"
diff --git a/tests/QuaternionTest.cpp b/tests/QuaternionTest.cpp
index 8a2b073..17372d4 100644
--- a/tests/QuaternionTest.cpp
+++ b/tests/QuaternionTest.cpp
@@ -8,8 +8,8 @@
// Copyright 2011 Bernhard Beschow <bbeschow@cs.tu-berlin.de>
//
-#include <QtCore/QMetaType>
-#include <QtTest/QtTest>
+#include <QMetaType>
+#include <QtTest>
#include "Quaternion.h"
#include "MarbleGlobal.h"
#include "TestUtils.h"
diff --git a/tests/RenderPluginModelTest.cpp b/tests/RenderPluginModelTest.cpp
index 108a9ce..5b62772 100644
--- a/tests/RenderPluginModelTest.cpp
+++ b/tests/RenderPluginModelTest.cpp
@@ -8,7 +8,7 @@
// Copyright 2012 Bernhard Beschow <bbeschow@cs.tu-berlin.de>
//
-#include <QtTest/QtTest>
+#include <QtTest>
#include "RenderPluginModel.h"
#include "MarbleMap.h"
diff --git a/tests/RenderPluginTest.cpp b/tests/RenderPluginTest.cpp
index 87d9a21..4fcb0de 100644
--- a/tests/RenderPluginTest.cpp
+++ b/tests/RenderPluginTest.cpp
@@ -8,7 +8,7 @@
// Copyright 2012 Bernhard Beschow <bbeschow@cs.tu-berlin.de>
//
-#include <QtTest/QtTest>
+#include <QtTest>
#include "MarbleModel.h"
#include "PluginManager.h"
diff --git a/tests/ScreenGraphicsItemTest.cpp b/tests/ScreenGraphicsItemTest.cpp
index ad27cd7..9c454b8 100644
--- a/tests/ScreenGraphicsItemTest.cpp
+++ b/tests/ScreenGraphicsItemTest.cpp
@@ -8,7 +8,7 @@
// Copyright 2013 Bernhard Beschow <bbeschow@cs.tu-berlin.de>
//
-#include <QtTest/QtTest>
+#include <QtTest>
#include "ScreenGraphicsItem.h"
diff --git a/tests/TestBalloonStyle.cpp b/tests/TestBalloonStyle.cpp
index 2cedd36..9333c39 100644
--- a/tests/TestBalloonStyle.cpp
+++ b/tests/TestBalloonStyle.cpp
@@ -8,8 +8,8 @@
// Copyright 2012 Dennis Nienhüser <earthwings@gentoo.org>
//
-#include <QtCore/QObject>
-#include <QtTest/QtTest>
+#include <QObject>
+#include <QtTest>
#include <GeoDataParser.h>
#include <GeoDataDocument.h>
diff --git a/tests/TestCamera.cpp b/tests/TestCamera.cpp
index 4a38b4f..9b1b075 100644
--- a/tests/TestCamera.cpp
+++ b/tests/TestCamera.cpp
@@ -8,8 +8,8 @@
// Copyright 2013 Dennis Nienhüser <earthwings@gentoo.org>
//
-#include <QtCore/QObject>
-#include <QtTest/QtTest>
+#include <QObject>
+#include <QtTest>
#include <GeoDataParser.h>
#include <GeoDataDocument.h>
diff --git a/tests/TestGeoData.cpp b/tests/TestGeoData.cpp
index fe72eaf..77ca0a1 100644
--- a/tests/TestGeoData.cpp
+++ b/tests/TestGeoData.cpp
@@ -8,9 +8,9 @@
// Copyright 2009 Bastian Holst <bastianholst@gmx.de>
//
-#include <QtTest/QTest>
-#include <QtCore/QList>
-#include <QtCore/QDebug>
+#include <QTest>
+#include <QList>
+#include <QDebug>
#include "GeoDataDocument.h"
#include "GeoDataFolder.h"
#include "GeoDataPlacemark.h"
diff --git a/tests/TestGeoDataCoordinates.cpp b/tests/TestGeoDataCoordinates.cpp
index 717c22b..76bf616 100644
--- a/tests/TestGeoDataCoordinates.cpp
+++ b/tests/TestGeoDataCoordinates.cpp
@@ -9,8 +9,8 @@
// Copyright 2011 Friedrich W. H. Kossebau <kossebau@kde.org>
// Copyright 2012 Bernhard Beschow <bbeschow@cs.tu-berlin.de>
-#include <QtTest/QtTest>
-#include <QtGui/QApplication>
+#include <QtTest>
+#include <QApplication>
#include "MarbleGlobal.h"
#include "MarbleWidget.h"
#include "AbstractFloatItem.h"
diff --git a/tests/TestGeoDataCopy.cpp b/tests/TestGeoDataCopy.cpp
index ca38ed0..ef5c355 100644
--- a/tests/TestGeoDataCopy.cpp
+++ b/tests/TestGeoDataCopy.cpp
@@ -8,11 +8,11 @@
// Copyright 2009 Patrick Spendrin <ps_ml@gmx.de>
//
-#include <QtTest/QtTest>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QPointF>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
+#include <QtTest>
+#include <QCoreApplication>
+#include <QPointF>
+#include <QString>
+#include <QStringList>
#include "MarbleDebug.h"
#include "MarbleDirs.h"
diff --git a/tests/TestGeoDataGeometry.cpp b/tests/TestGeoDataGeometry.cpp
index ac221ac..d0815a5 100644
--- a/tests/TestGeoDataGeometry.cpp
+++ b/tests/TestGeoDataGeometry.cpp
@@ -8,8 +8,8 @@
// Copyright 2009 Andrew Manson <g.real.ate@gmail.com>
//
-#include <QtCore/QObject>
-#include <QtTest/QtTest>
+#include <QObject>
+#include <QtTest>
#include "GeoDataPoint.h"
#include "GeoDataLinearRing.h"
diff --git a/tests/TestGeoDataLatLonAltBox.cpp b/tests/TestGeoDataLatLonAltBox.cpp
index ae8c2a0..beeaef0 100644
--- a/tests/TestGeoDataLatLonAltBox.cpp
+++ b/tests/TestGeoDataLatLonAltBox.cpp
@@ -9,7 +9,7 @@
// Copyright 2010 Cezar Mocan <mocancezar@gmail.com>
// Copyright 2012 Bernhard Beschow <bbeschow@cs.tu-berlin.de>
-#include <QtTest/QtTest>
+#include <QtTest>
#include "GeoDataCoordinates.h"
#include "GeoDataFolder.h"
#include "GeoDataLineString.h"
diff --git a/tests/TestGeoDataPack.cpp b/tests/TestGeoDataPack.cpp
index 7a02bc2..96bf60d 100644
--- a/tests/TestGeoDataPack.cpp
+++ b/tests/TestGeoDataPack.cpp
@@ -8,12 +8,12 @@
// Copyright 2008 Patrick Spendrin <ps_ml@gmx.de>
//
-#include <QtTest/QtTest>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QString>
-#include <QtCore/QBuffer>
-#include <QtCore/QByteArray>
-#include <QtCore/QDebug>
+#include <QtTest>
+#include <QCoreApplication>
+#include <QString>
+#include <QBuffer>
+#include <QByteArray>
+#include <QDebug>
#include "MarbleDirs.h"
#include "GeoDataParser.h"
diff --git a/tests/TestGeoDataTrack.cpp b/tests/TestGeoDataTrack.cpp
index fc5d86f..af85715 100644
--- a/tests/TestGeoDataTrack.cpp
+++ b/tests/TestGeoDataTrack.cpp
@@ -8,8 +8,8 @@
// Copyright 2011 Niko Sams <niko.sams@gmail.com>
//
-#include <QtCore/QObject>
-#include <QtTest/QtTest>
+#include <QObject>
+#include <QtTest>
#include "GeoDataPoint.h"
#include "GeoDataLinearRing.h"
diff --git a/tests/TestGeoDataWriter.cpp b/tests/TestGeoDataWriter.cpp
index 500d092..9ae6017 100644
--- a/tests/TestGeoDataWriter.cpp
+++ b/tests/TestGeoDataWriter.cpp
@@ -8,16 +8,16 @@
// Copyright 2009 Andrew Manson <g.real.ate@gmail.com>
//
-#include <QtCore/QObject>
-#include <QtTest/QtTest>
+#include <QObject>
+#include <QtTest>
#include "GeoDataParser.h"
#include "GeoDataDocument.h"
#include "GeoDataColorStyle.h"
#include "GeoWriter.h"
-#include <QtCore/QDir>
-#include <QtCore/QFile>
+#include <QDir>
+#include <QFile>
using namespace Marble;
diff --git a/tests/TestGeoPainter.cpp b/tests/TestGeoPainter.cpp
index a72c2bd..7b8ded2 100644
--- a/tests/TestGeoPainter.cpp
+++ b/tests/TestGeoPainter.cpp
@@ -8,8 +8,8 @@
// Copyright 2009 Bastian Holst <bastianholst@gmx.de>
//
-#include <QtCore/QList>
-#include <QtTest/QtTest>
+#include <QList>
+#include <QtTest>
#include "GeoDataLatLonAltBox.h"
#include "GeoDataLinearRing.h"
#include "GeoPainter_p.h"
diff --git a/tests/TestGeoSceneWriter.cpp b/tests/TestGeoSceneWriter.cpp
index f0e7c1e..a96db57 100644
--- a/tests/TestGeoSceneWriter.cpp
+++ b/tests/TestGeoSceneWriter.cpp
@@ -8,11 +8,11 @@
// Copyright 2011 Utku Aydın <utkuaydin34@gmail.com>
//
-#include <QtCore/QObject>
-#include <QtCore/QTemporaryFile>
-#include <QtTest/QTest>
-#include <QtCore/QDebug>
-#include <QtCore/QDir>
+#include <QObject>
+#include <QTemporaryFile>
+#include <QTest>
+#include <QDebug>
+#include <QDir>
#include "GeoSceneDocument.h"
#include "GeoSceneHead.h"
diff --git a/tests/TestGroundOverlay.cpp b/tests/TestGroundOverlay.cpp
index 7eeb774..99750f0 100644
--- a/tests/TestGroundOverlay.cpp
+++ b/tests/TestGroundOverlay.cpp
@@ -8,8 +8,8 @@
// Copyright 2012 Mohammed Nafees <nafees.technocool@gmail.com>
//
-#include <QtCore/QObject>
-#include <QtTest/QtTest>
+#include <QObject>
+#include <QtTest>
#include <GeoDataParser.h>
#include <GeoDataDocument.h>
diff --git a/tests/TestGxTimeSpan.cpp b/tests/TestGxTimeSpan.cpp
index 91d31bf..d58b47c 100644
--- a/tests/TestGxTimeSpan.cpp
+++ b/tests/TestGxTimeSpan.cpp
@@ -8,8 +8,8 @@
// Copyright 2013 Mayank Madan <maddiemadan@gmail.com>
//
-#include <QtCore/QObject>
-#include <QtTest/QtTest>
+#include <QObject>
+#include <QtTest>
#include <GeoDataParser.h>
#include <GeoDataDocument.h>
diff --git a/tests/TestGxTimeStamp.cpp b/tests/TestGxTimeStamp.cpp
index 5f6afd8..1ebd773 100644
--- a/tests/TestGxTimeStamp.cpp
+++ b/tests/TestGxTimeStamp.cpp
@@ -8,8 +8,8 @@
// Copyright 2013 Mayank Madan <maddiemadan@gmail.com>
//
-#include <QtCore/QObject>
-#include <QtTest/QtTest>
+#include <QObject>
+#include <QtTest>
#include <GeoDataParser.h>
#include <GeoDataDocument.h>
diff --git a/tests/TestLatLonQuad.cpp b/tests/TestLatLonQuad.cpp
index 63aaedd..9f4b5e5 100644
--- a/tests/TestLatLonQuad.cpp
+++ b/tests/TestLatLonQuad.cpp
@@ -8,8 +8,8 @@
// Copyright 2013 Dennis Nienhüser <earthwings@gentoo.org>
//
-#include <QtCore/QObject>
-#include <QtTest/QtTest>
+#include <QObject>
+#include <QtTest>
#include "TestUtils.h"
#include <GeoDataDocument.h>
diff --git a/tests/TestListStyle.cpp b/tests/TestListStyle.cpp
index f2a4933..0e7bfa7 100644
--- a/tests/TestListStyle.cpp
+++ b/tests/TestListStyle.cpp
@@ -8,8 +8,8 @@
// Copyright 2012 Mohammed Nafees <nafees.technocool@gmail.com>
//
-#include <QtCore/QObject>
-#include <QtTest/QtTest>
+#include <QObject>
+#include <QtTest>
#include <GeoDataParser.h>
#include <GeoDataDocument.h>
diff --git a/tests/TestModel.cpp b/tests/TestModel.cpp
index 044bd9b..0014cb8 100644
--- a/tests/TestModel.cpp
+++ b/tests/TestModel.cpp
@@ -9,8 +9,8 @@
// Copyright 2013 Sanjiban Bairagya <sanjiban22393@gmail.com>
//
-#include <QtCore/QObject>
-#include <QtTest/QtTest>
+#include <QObject>
+#include <QtTest>
#include <GeoDataParser.h>
#include <GeoDataDocument.h>
diff --git a/tests/TestNetworkLink.cpp b/tests/TestNetworkLink.cpp
index 7fd30cf..b4bcc3e 100644
--- a/tests/TestNetworkLink.cpp
+++ b/tests/TestNetworkLink.cpp
@@ -8,8 +8,8 @@
// Copyright 2013 Mayank Madan <maddiemadan@gmail.com>
//
-#include <QtCore/QObject>
-#include <QtTest/QtTest>
+#include <QObject>
+#include <QtTest>
#include "TestUtils.h"
#include <GeoDataDocument.h>
diff --git a/tests/TestOsmAnnotation.cpp b/tests/TestOsmAnnotation.cpp
index 0896455..7a0c4db 100644
--- a/tests/TestOsmAnnotation.cpp
+++ b/tests/TestOsmAnnotation.cpp
@@ -8,8 +8,8 @@
// Copyright 2009 Andrew Manson <g.real.ate@gmail.com>
//
-#include <QtCore/QObject>
-#include <QtTest/QtTest>
+#include <QObject>
+#include <QtTest>
#include "PlacemarkTextAnnotation.h"
#include "TextAnnotation.h"
diff --git a/tests/TestPhotoOverlay.cpp b/tests/TestPhotoOverlay.cpp
index 8fe1d31..61fd5fa 100644
--- a/tests/TestPhotoOverlay.cpp
+++ b/tests/TestPhotoOverlay.cpp
@@ -8,8 +8,8 @@
// Copyright 2013 Mohammed Nafees <nafees.technocool@gmail.com>
//
-#include <QtCore/QObject>
-#include <QtTest/QtTest>
+#include <QObject>
+#include <QtTest>
#include <GeoDataParser.h>
#include <GeoDataDocument.h>
diff --git a/tests/TestScreenOverlay.cpp b/tests/TestScreenOverlay.cpp
index b94d53e..6061377 100644
--- a/tests/TestScreenOverlay.cpp
+++ b/tests/TestScreenOverlay.cpp
@@ -8,8 +8,8 @@
// Copyright 2012 Dennis Nienhüser <earthwings@gentoo.org>
//
-#include <QtCore/QObject>
-#include <QtTest/QtTest>
+#include <QObject>
+#include <QtTest>
#include <GeoDataParser.h>
#include <GeoDataDocument.h>
diff --git a/tests/TestTimeSpan.cpp b/tests/TestTimeSpan.cpp
index d517377..6fd1106 100644
--- a/tests/TestTimeSpan.cpp
+++ b/tests/TestTimeSpan.cpp
@@ -8,8 +8,8 @@
// Copyright 2013 Dennis Nienhüser <earthwings@gentoo.org>
//
-#include <QtCore/QObject>
-#include <QtTest/QtTest>
+#include <QObject>
+#include <QtTest>
#include <GeoDataParser.h>
#include <GeoDataDocument.h>
diff --git a/tests/TestTimeStamp.cpp b/tests/TestTimeStamp.cpp
index 8921f49..21f8b9a 100644
--- a/tests/TestTimeStamp.cpp
+++ b/tests/TestTimeStamp.cpp
@@ -8,8 +8,8 @@
// Copyright 2013 Dennis Nienhüser <earthwings@gentoo.org>
//
-#include <QtCore/QObject>
-#include <QtTest/QtTest>
+#include <QObject>
+#include <QtTest>
#include <GeoDataParser.h>
#include <GeoDataDocument.h>
diff --git a/tests/TestTour.cpp b/tests/TestTour.cpp
index 68c5f1f..4250ead 100644
--- a/tests/TestTour.cpp
+++ b/tests/TestTour.cpp
@@ -8,8 +8,8 @@
// Copyright 2013 Illya Kovalevskyy <illya.kovalevskyy@gmail.com>
//
-#include <QtCore/QObject>
-#include <QtTest/QtTest>
+#include <QObject>
+#include <QtTest>
#include <GeoDataParser.h>
#include <GeoDataDocument.h>
diff --git a/tests/TileIdTest.cpp b/tests/TileIdTest.cpp
index c6d8d88..16f8567 100644
--- a/tests/TileIdTest.cpp
+++ b/tests/TileIdTest.cpp
@@ -8,8 +8,8 @@
// Copyright 2012 Thibaut Gridel <tgridel@free.fr>
-#include <QtCore/QMetaType>
-#include <QtTest/QtTest>
+#include <QMetaType>
+#include <QtTest>
#include "TileId.h"
#include "GeoDataCoordinates.h"
#include "TestUtils.h"
diff --git a/tests/ViewportParamsTest.cpp b/tests/ViewportParamsTest.cpp
index 08201c5..f7b05b8 100644
--- a/tests/ViewportParamsTest.cpp
+++ b/tests/ViewportParamsTest.cpp
@@ -9,7 +9,7 @@
// Copyright 2012,2013 Bernhard Beschow <bbeschow@cs.tu-berlin.de>
//
-#include <QtTest/QtTest>
+#include <QtTest>
#include "TestUtils.h"
#include "ViewportParams.h"
diff --git a/tools/asc2kml/asc2kml.cpp b/tools/asc2kml/asc2kml.cpp
index 3e7b322..1c60d26 100644
--- a/tools/asc2kml/asc2kml.cpp
+++ b/tools/asc2kml/asc2kml.cpp
@@ -13,10 +13,10 @@
// #include <zlib.h>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDebug>
-#include <QtCore/QFile>
-#include <QtCore/QStringList>
+#include <QCoreApplication>
+#include <QDebug>
+#include <QFile>
+#include <QStringList>
QString escapeXml( const QString &str )
diff --git a/tools/constellations2kml/constellations2kml.cpp \
b/tools/constellations2kml/constellations2kml.cpp index 62139d9..c6ab73b 100644
--- a/tools/constellations2kml/constellations2kml.cpp
+++ b/tools/constellations2kml/constellations2kml.cpp
@@ -9,9 +9,9 @@
//
-#include <QtCore/QFile>
-#include <QtCore/QDebug>
-#include <QtGui/QApplication>
+#include <QFile>
+#include <QDebug>
+#include <QApplication>
#include <QStringList>
#include <QHash>
#include <QPair>
diff --git a/tools/dateline/dateline.cpp b/tools/dateline/dateline.cpp
index 93836ba..748a73e 100644
--- a/tools/dateline/dateline.cpp
+++ b/tools/dateline/dateline.cpp
@@ -12,11 +12,11 @@
#include <cmath>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDebug>
-#include <QtCore/QFile>
-#include <QtCore/QVector>
-#include <QtCore/QStringList>
+#include <QCoreApplication>
+#include <QDebug>
+#include <QFile>
+#include <QVector>
+#include <QStringList>
#include "../../src/lib/Quaternion.h"
using namespace Marble;
diff --git a/tools/dso2kml/dso2kml.cpp b/tools/dso2kml/dso2kml.cpp
index 4e36ec6..c535cc3 100644
--- a/tools/dso2kml/dso2kml.cpp
+++ b/tools/dso2kml/dso2kml.cpp
@@ -9,9 +9,9 @@
//
-#include <QtCore/QFile>
-#include <QtCore/QDebug>
-#include <QtGui/QApplication>
+#include <QFile>
+#include <QDebug>
+#include <QApplication>
#include <QStringList>
#include <cmath>
diff --git a/tools/iau2kml/iau2kml.cpp b/tools/iau2kml/iau2kml.cpp
index a426517..3f71de2 100644
--- a/tools/iau2kml/iau2kml.cpp
+++ b/tools/iau2kml/iau2kml.cpp
@@ -12,10 +12,10 @@
// #include <zlib.h>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDebug>
-#include <QtCore/QFile>
-#include <QtCore/QStringList>
+#include <QCoreApplication>
+#include <QDebug>
+#include <QFile>
+#include <QStringList>
QString escapeXml( const QString &str )
diff --git a/tools/kml2kml/kml2kml.cpp b/tools/kml2kml/kml2kml.cpp
index e9b7b27..3439be9 100644
--- a/tools/kml2kml/kml2kml.cpp
+++ b/tools/kml2kml/kml2kml.cpp
@@ -15,7 +15,7 @@
#include <GeoDataParser.h>
#include <GeoWriter.h>
-#include <QtCore/QFile>
+#include <QFile>
#include <iostream>
using namespace std;
diff --git a/tools/mapreproject/NasaWorldWindToOpenStreetMapConverter.cpp \
b/tools/mapreproject/NasaWorldWindToOpenStreetMapConverter.cpp index f6b58bd..d94b49a \
100644
--- a/tools/mapreproject/NasaWorldWindToOpenStreetMapConverter.cpp
+++ b/tools/mapreproject/NasaWorldWindToOpenStreetMapConverter.cpp
@@ -3,10 +3,10 @@
#include "OsmTileClusterRenderer.h"
#include "Thread.h"
-#include <QtCore/QDebug>
-#include <QtCore/QMetaObject>
-#include <QtCore/QString>
-#include <QtCore/QThread>
+#include <QDebug>
+#include <QMetaObject>
+#include <QString>
+#include <QThread>
#include <cmath>
diff --git a/tools/mapreproject/NwwMapImage.cpp b/tools/mapreproject/NwwMapImage.cpp
index fca9f02..32af040 100644
--- a/tools/mapreproject/NwwMapImage.cpp
+++ b/tools/mapreproject/NwwMapImage.cpp
@@ -2,7 +2,7 @@
#include "InterpolationMethod.h"
-#include <QtCore/QDebug>
+#include <QDebug>
#include <cmath>
NwwMapImage::NwwMapImage( QDir const & baseDirectory, int const tileLevel )
diff --git a/tools/mapreproject/OsmTileClusterRenderer.cpp \
b/tools/mapreproject/OsmTileClusterRenderer.cpp index 896fffe..9bacc64 100644
--- a/tools/mapreproject/OsmTileClusterRenderer.cpp
+++ b/tools/mapreproject/OsmTileClusterRenderer.cpp
@@ -2,8 +2,8 @@
#include "ReadOnlyMapImage.h"
-#include <QtCore/QDebug>
-#include <QtCore/QTime>
+#include <QDebug>
+#include <QTime>
#include <cmath>
diff --git a/tools/mapreproject/Thread.cpp b/tools/mapreproject/Thread.cpp
index 425b9bf..1705e3d 100644
--- a/tools/mapreproject/Thread.cpp
+++ b/tools/mapreproject/Thread.cpp
@@ -40,7 +40,7 @@
#include "Thread.h"
-#include <QtCore/QSignalMapper>
+#include <QSignalMapper>
Thread::Thread( QObject * const parent )
: QThread( parent )
diff --git a/tools/mapreproject/main.cpp b/tools/mapreproject/main.cpp
index 15cdcfa..d3d15d2 100644
--- a/tools/mapreproject/main.cpp
+++ b/tools/mapreproject/main.cpp
@@ -6,12 +6,12 @@
#include "Thread.h"
#include "mapreproject.h"
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDebug>
-#include <QtCore/QDir>
-#include <QtCore/QPair>
-#include <QtCore/QThread>
-#include <QtCore/QVector>
+#include <QCoreApplication>
+#include <QDebug>
+#include <QDir>
+#include <QPair>
+#include <QThread>
+#include <QVector>
#include <getopt.h>
diff --git a/tools/maptheme-previewimage/main.cpp \
b/tools/maptheme-previewimage/main.cpp index da0abe0..513bf70 100644
--- a/tools/maptheme-previewimage/main.cpp
+++ b/tools/maptheme-previewimage/main.cpp
@@ -11,10 +11,10 @@
#include <marble/MarbleWidget.h>
#include <marble/RenderPlugin.h>
-#include <QtCore/QDebug>
-#include <QtGui/QApplication>
-#include <QtGui/QPixmap>
-#include <QtGui/QPainter>
+#include <QDebug>
+#include <QApplication>
+#include <QPixmap>
+#include <QPainter>
using namespace Marble;
diff --git a/tools/osm-addresses/OsmParser.cpp b/tools/osm-addresses/OsmParser.cpp
index 1f8ba45..ab468fc 100644
--- a/tools/osm-addresses/OsmParser.cpp
+++ b/tools/osm-addresses/OsmParser.cpp
@@ -25,8 +25,8 @@
#include "geodata/writer/GeoWriter.h"
#include "geodata/data/GeoDataExtendedData.h"
-#include <QtCore/QDebug>
-#include <QtCore/QTime>
+#include <QDebug>
+#include <QTime>
namespace Marble
{
diff --git a/tools/osm-addresses/OsmRegion.cpp b/tools/osm-addresses/OsmRegion.cpp
index 1051bcf..a9f8d65 100644
--- a/tools/osm-addresses/OsmRegion.cpp
+++ b/tools/osm-addresses/OsmRegion.cpp
@@ -10,7 +10,7 @@
#include "OsmRegion.h"
-#include <QtCore/QList>
+#include <QList>
namespace Marble
{
diff --git a/tools/osm-addresses/SqlWriter.cpp b/tools/osm-addresses/SqlWriter.cpp
index 293d45d..27762b9 100644
--- a/tools/osm-addresses/SqlWriter.cpp
+++ b/tools/osm-addresses/SqlWriter.cpp
@@ -10,11 +10,11 @@
#include "SqlWriter.h"
-#include <QtCore/QVariant>
-#include <QtCore/QDebug>
-#include <QtSql/QSqlDatabase>
-#include <QtSql/QSqlQuery>
-#include <QtSql/QSqlError>
+#include <QVariant>
+#include <QDebug>
+#include <QSqlDatabase>
+#include <QSqlQuery>
+#include <QSqlError>
namespace Marble
{
diff --git a/tools/osm-addresses/main.cpp b/tools/osm-addresses/main.cpp
index 75f6a4f..2ed05b6 100644
--- a/tools/osm-addresses/main.cpp
+++ b/tools/osm-addresses/main.cpp
@@ -12,10 +12,10 @@
#include "pbf/PbfParser.h"
#include "xml/XmlParser.h"
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDebug>
-#include <QtCore/QFileInfo>
-#include <QtCore/QTime>
+#include <QCoreApplication>
+#include <QDebug>
+#include <QFileInfo>
+#include <QTime>
using namespace Marble;
diff --git a/tools/osm-addresses/pbf/PbfParser.cpp \
b/tools/osm-addresses/pbf/PbfParser.cpp index 9c1d9f5..d1b78c9 100644
--- a/tools/osm-addresses/pbf/PbfParser.cpp
+++ b/tools/osm-addresses/pbf/PbfParser.cpp
@@ -14,7 +14,7 @@
#include "PbfParser.h"
-#include <QtCore/QDebug>
+#include <QDebug>
#include <zlib.h>
diff --git a/tools/osm-addresses/xml/XmlParser.cpp \
b/tools/osm-addresses/xml/XmlParser.cpp index 9bd8806..21c7da0 100644
--- a/tools/osm-addresses/xml/XmlParser.cpp
+++ b/tools/osm-addresses/xml/XmlParser.cpp
@@ -10,7 +10,7 @@
#include "XmlParser.h"
-#include <QtCore/QDebug>
+#include <QDebug>
namespace Marble
{
diff --git a/tools/osm-sisyphus/job.cpp b/tools/osm-sisyphus/job.cpp
index 20367d0..88ddd77 100644
--- a/tools/osm-sisyphus/job.cpp
+++ b/tools/osm-sisyphus/job.cpp
@@ -12,9 +12,9 @@
#include "logger.h"
#include "upload.h"
-#include <QtCore/QDebug>
-#include <QtCore/QDateTime>
-#include <QtCore/QProcess>
+#include <QDebug>
+#include <QDateTime>
+#include <QProcess>
Job::Job(const Region ®ion, const JobParameters ¶meters, QObject *parent) :
QObject(parent), m_status(Waiting), m_region(region), m_parameters(parameters)
diff --git a/tools/osm-sisyphus/jobmanager.cpp b/tools/osm-sisyphus/jobmanager.cpp
index 5641644..82101b6 100644
--- a/tools/osm-sisyphus/jobmanager.cpp
+++ b/tools/osm-sisyphus/jobmanager.cpp
@@ -10,12 +10,12 @@
#include "jobmanager.h"
-#include <QtCore/QTimer>
-#include <QtCore/QFile>
-#include <QtCore/QTextStream>
-#include <QtCore/QDebug>
-#include <QtCore/QProcess>
-#include <QtXml/QDomDocument>
+#include <QTimer>
+#include <QFile>
+#include <QTextStream>
+#include <QDebug>
+#include <QProcess>
+#include <QDomDocument>
JobManager::JobManager(QObject *parent) :
QObject(parent)
diff --git a/tools/osm-sisyphus/jobqueue.cpp b/tools/osm-sisyphus/jobqueue.cpp
index 1088abb..2a5eff1 100644
--- a/tools/osm-sisyphus/jobqueue.cpp
+++ b/tools/osm-sisyphus/jobqueue.cpp
@@ -11,8 +11,8 @@
#include "jobqueue.h"
#include "logger.h"
-#include <QtCore/QDebug>
-#include <QtCore/QThreadPool>
+#include <QDebug>
+#include <QThreadPool>
JobQueue::JobQueue(QObject *parent) :
QObject(parent), m_maxConcurrentJobs(1)
diff --git a/tools/osm-sisyphus/logger.cpp b/tools/osm-sisyphus/logger.cpp
index ae691e9..4cabbf4 100644
--- a/tools/osm-sisyphus/logger.cpp
+++ b/tools/osm-sisyphus/logger.cpp
@@ -10,11 +10,11 @@
#include "logger.h"
-#include <QtCore/QDebug>
-#include <QtCore/QVariant>
-#include <QtSql/QSqlDatabase>
-#include <QtSql/QSqlQuery>
-#include <QtSql/QSqlError>
+#include <QDebug>
+#include <QVariant>
+#include <QSqlDatabase>
+#include <QSqlQuery>
+#include <QSqlError>
class LoggerPrivate
{
diff --git a/tools/osm-sisyphus/main.cpp b/tools/osm-sisyphus/main.cpp
index 6a5cb4e..4b51023 100644
--- a/tools/osm-sisyphus/main.cpp
+++ b/tools/osm-sisyphus/main.cpp
@@ -12,8 +12,8 @@
#include "logger.h"
#include "upload.h"
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDebug>
+#include <QCoreApplication>
+#include <QDebug>
void usage(const QString &app)
{
diff --git a/tools/osm-sisyphus/region.cpp b/tools/osm-sisyphus/region.cpp
index 205c6b2..335a71b 100644
--- a/tools/osm-sisyphus/region.cpp
+++ b/tools/osm-sisyphus/region.cpp
@@ -10,7 +10,7 @@
#include "region.h"
-#include <QtCore/QFileInfo>
+#include <QFileInfo>
Region::Region()
{
diff --git a/tools/osm-sisyphus/upload.cpp b/tools/osm-sisyphus/upload.cpp
index 79784ee..4ae98a5 100644
--- a/tools/osm-sisyphus/upload.cpp
+++ b/tools/osm-sisyphus/upload.cpp
@@ -12,13 +12,13 @@
#include "logger.h"
-#include <QtCore/QDebug>
-#include <QtCore/QProcess>
-#include <QtCore/QDateTime>
-#include <QtCore/QDir>
-#include <QtCore/QTemporaryFile>
-#include <QtCore/QUrl>
-#include <QtXml/QDomDocument>
+#include <QDebug>
+#include <QProcess>
+#include <QDateTime>
+#include <QDir>
+#include <QTemporaryFile>
+#include <QUrl>
+#include <QDomDocument>
Upload::Upload(QObject *parent) :
QObject(parent), m_uploadFiles(true)
diff --git a/tools/pnt2svg/pnt2svg.cpp b/tools/pnt2svg/pnt2svg.cpp
index 3e870ce..6299942 100644
--- a/tools/pnt2svg/pnt2svg.cpp
+++ b/tools/pnt2svg/pnt2svg.cpp
@@ -9,12 +9,12 @@
//
-#include <QtGui/QApplication>
-#include <QtCore/QDataStream>
-#include <QtCore/QFile>
-#include <QtCore/QStringList>
-#include <QtCore/QTextStream>
-#include <QtCore/QDebug>
+#include <QApplication>
+#include <QDataStream>
+#include <QFile>
+#include <QStringList>
+#include <QTextStream>
+#include <QDebug>
int main(int argc, char *argv[])
{
diff --git a/tools/pntdel/pntdel.cpp b/tools/pntdel/pntdel.cpp
index 75518b8..3e8c8a0 100644
--- a/tools/pntdel/pntdel.cpp
+++ b/tools/pntdel/pntdel.cpp
@@ -9,11 +9,11 @@
//
-#include <QtGui/QApplication>
-#include <QtCore/QDataStream>
-#include <QtCore/QFile>
-#include <QtCore/QDebug>
-#include <QtCore/QStringList>
+#include <QApplication>
+#include <QDataStream>
+#include <QFile>
+#include <QDebug>
+#include <QStringList>
int main(int argc, char *argv[])
{
diff --git a/tools/pntreplace/pntreplace.cpp b/tools/pntreplace/pntreplace.cpp
index b50491c..041da5b 100644
--- a/tools/pntreplace/pntreplace.cpp
+++ b/tools/pntreplace/pntreplace.cpp
@@ -9,13 +9,13 @@
//
-#include <QtGui/QApplication>
-#include <QtCore/QDataStream>
-#include <QtCore/QFile>
-#include <QtCore/QDebug>
-#include <QtXml/QXmlInputSource>
-#include <QtXml/QXmlSimpleReader>
-#include <QtCore/QStringList>
+#include <QApplication>
+#include <QDataStream>
+#include <QFile>
+#include <QDebug>
+#include <QXmlInputSource>
+#include <QXmlSimpleReader>
+#include <QStringList>
#include "svgxmlhandler.h"
void parseSvg( const QString & svgFilename, QDataStream * out, const QString & path, \
int header ) {
diff --git a/tools/pntreplace/svgxmlhandler.cpp b/tools/pntreplace/svgxmlhandler.cpp
index 86ed2f5..9370465 100644
--- a/tools/pntreplace/svgxmlhandler.cpp
+++ b/tools/pntreplace/svgxmlhandler.cpp
@@ -11,7 +11,7 @@
#include "svgxmlhandler.h"
-#include <QtCore/QDebug>
+#include <QDebug>
SVGXmlHandler::SVGXmlHandler( QDataStream * out, const QString & path, int header )
: m_stream(out),
diff --git a/tools/poly2kml/main.cpp b/tools/poly2kml/main.cpp
index 542dd00..361502c 100644
--- a/tools/poly2kml/main.cpp
+++ b/tools/poly2kml/main.cpp
@@ -8,12 +8,12 @@
// Copyright 2010 Dennis Nienhüser <earthwings@gentoo.org>
//
-#include <QtCore/QCoreApplication>
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
-#include <QtCore/QTextStream>
-#include <QtCore/QTime>
-#include <QtCore/QDebug>
+#include <QCoreApplication>
+#include <QFile>
+#include <QFileInfo>
+#include <QTextStream>
+#include <QTime>
+#include <QDebug>
#include "geodata/parser/GeoDataParser.h"
#include "geodata/data/GeoDataLineString.h"
diff --git a/tools/shp2pn2/shp2pn2.cpp b/tools/shp2pn2/shp2pn2.cpp
index 86a7c87..7d4dcbd 100644
--- a/tools/shp2pn2/shp2pn2.cpp
+++ b/tools/shp2pn2/shp2pn2.cpp
@@ -33,13 +33,13 @@
//
-#include <QtCore/QDebug>
-#include <QtCore/QVector>
-#include <QtCore/QFileInfo>
-#include <QtCore/QFile>
-#include <QtCore/QDataStream>
-#include <QtGui/QApplication>
-#include <QtGui/QTreeView>
+#include <QDebug>
+#include <QVector>
+#include <QFileInfo>
+#include <QFile>
+#include <QDataStream>
+#include <QApplication>
+#include <QTreeView>
#include <marble/MarbleWidget.h>
#include <marble/MarbleModel.h>
diff --git a/tools/speaker-files/main.cpp b/tools/speaker-files/main.cpp
index c8c5637..f74b97d 100644
--- a/tools/speaker-files/main.cpp
+++ b/tools/speaker-files/main.cpp
@@ -33,18 +33,18 @@
*
*/
-#include <QtCore/QCoreApplication>
-#include <QtCore/QString>
-#include <QtCore/QDebug>
-#include <QtCore/QFileInfo>
-#include <QtCore/QDir>
-#include <QtCore/QVariant>
-#include <QtCore/QTemporaryFile>
-#include <QtCore/QProcess>
-
-#include <QtSql/QSqlDatabase>
-#include <QtSql/QSqlQuery>
-#include <QtSql/QSqlError>
+#include <QCoreApplication>
+#include <QString>
+#include <QDebug>
+#include <QFileInfo>
+#include <QDir>
+#include <QVariant>
+#include <QTemporaryFile>
+#include <QProcess>
+
+#include <QSqlDatabase>
+#include <QSqlQuery>
+#include <QSqlError>
QStringList tomTomFiles()
{
diff --git a/tools/stars/stars.cpp b/tools/stars/stars.cpp
index 471a5fd..fa3abb5 100644
--- a/tools/stars/stars.cpp
+++ b/tools/stars/stars.cpp
@@ -11,9 +11,9 @@
//
-#include <QtCore/QFile>
-#include <QtCore/QDebug>
-#include <QtGui/QApplication>
+#include <QFile>
+#include <QDebug>
+#include <QApplication>
#include <QStringList>
#include <cmath>
diff --git a/tools/svg2pnt/svg2pnt.cpp b/tools/svg2pnt/svg2pnt.cpp
index af37396..f7f4771 100644
--- a/tools/svg2pnt/svg2pnt.cpp
+++ b/tools/svg2pnt/svg2pnt.cpp
@@ -10,8 +10,8 @@
//
-#include <QtGui/QApplication>
-#include <QtCore/QDebug>
+#include <QApplication>
+#include <QDebug>
#include "svgxmlhandler.h"
diff --git a/tools/svg2pnt/svgxmlhandler.cpp b/tools/svg2pnt/svgxmlhandler.cpp
index d640769..4edf367 100644
--- a/tools/svg2pnt/svgxmlhandler.cpp
+++ b/tools/svg2pnt/svgxmlhandler.cpp
@@ -11,7 +11,7 @@
#include "svgxmlhandler.h"
-#include <QtCore/QDebug>
+#include <QDebug>
SVGXmlHandler::SVGXmlHandler(const QString& targetfile)
{
diff --git a/tools/translations/merge_ts_po.cpp b/tools/translations/merge_ts_po.cpp
index 0ae50df..0f7cb76 100644
--- a/tools/translations/merge_ts_po.cpp
+++ b/tools/translations/merge_ts_po.cpp
@@ -8,10 +8,10 @@
// Copyright 2011 Dennis Nienhüser <earthwings@gentoo.org>
//
-#include <QtCore/QString>
-#include <QtCore/QFileInfo>
-#include <QtCore/QTextStream>
-#include <QtCore/QDebug>
+#include <QString>
+#include <QFileInfo>
+#include <QTextStream>
+#include <QDebug>
void usage( const QString &app )
{
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic