[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [marble/qt5] /: ported runner plugins to Qt5
From: Michael Zanetti <mzanetti () kde ! org>
Date: 2013-08-29 19:32:42
Message-ID: E1VF7xS-0002Tc-6J () scm ! kde ! org
[Download RAW message or body]
Git commit db5fec5e9480974454961ec54c8befe953164c36 by Michael Zanetti.
Committed on 29/08/2013 at 19:32.
Pushed by mzanetti into branch 'qt5'.
ported runner plugins to Qt5
M +9 -1 MarbleMacros.cmake
M +1 -1 src/plugins/CMakeLists.txt
M +3 -1 src/plugins/runner/cache/CMakeLists.txt
M +3 -1 src/plugins/runner/gosmore-reversegeocoding/CMakeLists.txt
M +3 -1 src/plugins/runner/gosmore-routing/CMakeLists.txt
M +11 -3 src/plugins/runner/gpx/CMakeLists.txt
M +3 -1 src/plugins/runner/hostip/CMakeLists.txt
M +3 -1 src/plugins/runner/json/CMakeLists.txt
M +3 -1 src/plugins/runner/kml/CMakeLists.txt
M +3 -1 src/plugins/runner/latlon/CMakeLists.txt
M +7 -1 src/plugins/runner/local-osm-search/CMakeLists.txt
M +3 -1 src/plugins/runner/localdatabase/CMakeLists.txt
M +3 -1 src/plugins/runner/log/CMakeLists.txt
M +9 -2 src/plugins/runner/mapquest/CMakeLists.txt
M +9 -3 src/plugins/runner/monav/CMakeLists.txt
M +2 -1 src/plugins/runner/monav/MonavMapsModel.cpp
M +8 -1 src/plugins/runner/nominatim-reversegeocoding/CMakeLists.txt
M +8 -1 src/plugins/runner/nominatim-search/CMakeLists.txt
M +8 -1 src/plugins/runner/open-source-routing-machine/CMakeLists.txt
M +1 -1 src/plugins/runner/open-source-routing-machine/OSRMRunner.cpp
M +9 -2 src/plugins/runner/openrouteservice/CMakeLists.txt
M +3 -1 src/plugins/runner/osm/CMakeLists.txt
M +3 -1 src/plugins/runner/pn2/CMakeLists.txt
M +3 -1 src/plugins/runner/pnt/CMakeLists.txt
M +4 -2 src/plugins/runner/routino/CMakeLists.txt
M +8 -1 src/plugins/runner/yours/CMakeLists.txt
http://commits.kde.org/marble/db5fec5e9480974454961ec54c8befe953164c36
diff --git a/MarbleMacros.cmake b/MarbleMacros.cmake
index 9cb5531..903bc78 100644
--- a/MarbleMacros.cmake
+++ b/MarbleMacros.cmake
@@ -51,6 +51,14 @@ macro(qt_add_resources)
endif()
endmacro()
+macro(qt_generate_moc)
+ if( QT4_FOUND )
+ qt4_generate_moc(${ARGN})
+ else()
+ qt5_generate_moc(${ARGN})
+ endif()
+endmacro()
+
# the place to put in common cmake macros
# this is needed to minimize the amount of errors to do
macro( marble_add_plugin _target_name )
@@ -173,7 +181,7 @@ macro( marble_add_test TEST_NAME )
if( BUILD_MARBLE_TESTS )
set( ${TEST_NAME}_SRCS ${TEST_NAME}.cpp ${ARGN} )
if( QTONLY )
- qt4_generate_moc( ${TEST_NAME}.cpp \
${CMAKE_CURRENT_BINARY_DIR}/${TEST_NAME}.moc ) + qt_generate_moc( \
${TEST_NAME}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${TEST_NAME}.moc ) include_directories( \
${CMAKE_CURRENT_BINARY_DIR} )
set( ${TEST_NAME}_SRCS ${CMAKE_CURRENT_BINARY_DIR}/${TEST_NAME}.moc \
${${TEST_NAME}_SRCS} )
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
index b1d1d83..014bff1 100644
--- a/src/plugins/CMakeLists.txt
+++ b/src/plugins/CMakeLists.txt
@@ -1,7 +1,7 @@
add_subdirectory( designer )
add_subdirectory( declarative )
add_subdirectory( render )
-#add_subdirectory( runner )
+add_subdirectory( runner )
#add_subdirectory( templates )
#add_subdirectory( positionprovider )
diff --git a/src/plugins/runner/cache/CMakeLists.txt \
b/src/plugins/runner/cache/CMakeLists.txt index 29fa99a..061de28 100644
--- a/src/plugins/runner/cache/CMakeLists.txt
+++ b/src/plugins/runner/cache/CMakeLists.txt
@@ -5,7 +5,9 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
${QT_INCLUDE_DIR}
)
-INCLUDE(${QT_USE_FILE})
+if( QT4_FOUND )
+ INCLUDE(${QT_USE_FILE})
+endif()
set( cache_SRCS CachePlugin.cpp CacheRunner.cpp )
diff --git a/src/plugins/runner/gosmore-reversegeocoding/CMakeLists.txt \
b/src/plugins/runner/gosmore-reversegeocoding/CMakeLists.txt index 3137412..a231875 \
100644
--- a/src/plugins/runner/gosmore-reversegeocoding/CMakeLists.txt
+++ b/src/plugins/runner/gosmore-reversegeocoding/CMakeLists.txt
@@ -5,7 +5,9 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
${QT_INCLUDE_DIR}
)
-INCLUDE(${QT_USE_FILE})
+if( QT4_FOUND )
+ INCLUDE(${QT_USE_FILE})
+endif()
set( gosmore_SRCS GosmoreReverseGeocodingRunner.cpp \
GosmoreReverseGeocodingPlugin.cpp )
diff --git a/src/plugins/runner/gosmore-routing/CMakeLists.txt \
b/src/plugins/runner/gosmore-routing/CMakeLists.txt index 66e2b90..68288ac 100644
--- a/src/plugins/runner/gosmore-routing/CMakeLists.txt
+++ b/src/plugins/runner/gosmore-routing/CMakeLists.txt
@@ -5,7 +5,9 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
${QT_INCLUDE_DIR}
)
-INCLUDE(${QT_USE_FILE})
+if( QT4_FOUND )
+ INCLUDE(${QT_USE_FILE})
+endif()
set( gosmore_SRCS GosmoreRoutingRunner.cpp GosmoreRoutingPlugin.cpp )
diff --git a/src/plugins/runner/gpx/CMakeLists.txt \
b/src/plugins/runner/gpx/CMakeLists.txt index 74afed1..ff7f9ae 100644
--- a/src/plugins/runner/gpx/CMakeLists.txt
+++ b/src/plugins/runner/gpx/CMakeLists.txt
@@ -6,7 +6,9 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
${QT_INCLUDE_DIR}
)
-INCLUDE(${QT_USE_FILE})
+if( QT4_FOUND )
+ INCLUDE(${QT_USE_FILE})
+endif()
set( gpx_handlers_SRCS
handlers/GPXElementDictionary.cpp
@@ -51,8 +53,13 @@ if( BUILD_MARBLE_TESTS )
include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/tests )
set( TestTrack_SRCS tests/TestTrack.cpp GpxParser.cpp ${gpx_handlers_SRCS} )
if( QTONLY )
- qt4_generate_moc( tests/TestTrack.cpp \
${CMAKE_CURRENT_BINARY_DIR}/TestTrack.moc )
- include_directories( ${CMAKE_CURRENT_BINARY_DIR}/tests )
+ qt_generate_moc( tests/TestTrack.cpp \
${CMAKE_CURRENT_BINARY_DIR}/TestTrack.moc ) + include_directories(
+ ${CMAKE_CURRENT_BINARY_DIR}/tests
+ if( NOT QT4_FOUND )
+ ${Qt5Test_INCLUDE_DIRS}
+ endif()
+ )
set( TestTrack_SRCS TestTrack.moc ${TestTrack_SRCS} )
add_executable( TestTrack ${TestTrack_SRCS} )
@@ -63,6 +70,7 @@ if( BUILD_MARBLE_TESTS )
${QT_QTCORE_LIBRARY}
${QT_QTGUI_LIBRARY}
${QT_QTTEST_LIBRARY}
+ ${Qt5Test_LIBRARIES}
marblewidget )
set_target_properties( TestTrack PROPERTIES
COMPILE_FLAGS "-DDATA_PATH=\"\\\"${DATA_PATH}\\\"\" \
-DPLUGIN_PATH=\"\\\"${PLUGIN_PATH}\\\"\"" )
diff --git a/src/plugins/runner/hostip/CMakeLists.txt \
b/src/plugins/runner/hostip/CMakeLists.txt index fcdb7a3..29caf4a 100644
--- a/src/plugins/runner/hostip/CMakeLists.txt
+++ b/src/plugins/runner/hostip/CMakeLists.txt
@@ -5,7 +5,9 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
${QT_INCLUDE_DIR}
)
-INCLUDE(${QT_USE_FILE})
+if( QT4_FOUND )
+ INCLUDE(${QT_USE_FILE})
+endif()
set( hostip_SRCS HostipRunner.cpp HostipPlugin.cpp )
diff --git a/src/plugins/runner/json/CMakeLists.txt \
b/src/plugins/runner/json/CMakeLists.txt index a5e9f70..862013c 100644
--- a/src/plugins/runner/json/CMakeLists.txt
+++ b/src/plugins/runner/json/CMakeLists.txt
@@ -5,7 +5,9 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
${QT_INCLUDE_DIR}
)
-INCLUDE(${QT_USE_FILE})
+if( QT4_FOUND )
+ INCLUDE(${QT_USE_FILE})
+endif()
set( json_SRCS JsonRunner.cpp JsonPlugin.cpp JsonParser.cpp )
diff --git a/src/plugins/runner/kml/CMakeLists.txt \
b/src/plugins/runner/kml/CMakeLists.txt index 1c35096..600dbfa 100644
--- a/src/plugins/runner/kml/CMakeLists.txt
+++ b/src/plugins/runner/kml/CMakeLists.txt
@@ -6,7 +6,9 @@ INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/src/lib/geodata/handlers/kml
${QT_INCLUDE_DIR}
)
-INCLUDE(${QT_USE_FILE})
+if( QT4_FOUND )
+ INCLUDE(${QT_USE_FILE})
+endif()
set( kml_SRCS KmlDocument.cpp KmlParser.cpp KmlPlugin.cpp KmlRunner.cpp )
diff --git a/src/plugins/runner/latlon/CMakeLists.txt \
b/src/plugins/runner/latlon/CMakeLists.txt index ff8ff37..a833e06 100644
--- a/src/plugins/runner/latlon/CMakeLists.txt
+++ b/src/plugins/runner/latlon/CMakeLists.txt
@@ -5,7 +5,9 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
${QT_INCLUDE_DIR}
)
-INCLUDE(${QT_USE_FILE})
+if( QT4_FOUND )
+ INCLUDE(${QT_USE_FILE})
+endif()
set( latlon_SRCS LatLonRunner.cpp LatLonPlugin.cpp )
diff --git a/src/plugins/runner/local-osm-search/CMakeLists.txt \
b/src/plugins/runner/local-osm-search/CMakeLists.txt index 116f4b3..e639f42 100644
--- a/src/plugins/runner/local-osm-search/CMakeLists.txt
+++ b/src/plugins/runner/local-osm-search/CMakeLists.txt
@@ -4,8 +4,14 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${QT_INCLUDE_DIR}
+
+ if( NOT QT4_fOUND )
+ ${Qt5Sql_INCLUDE_DIRS}
+ endif()
)
-INCLUDE(${QT_USE_FILE})
+if( $QT4_FOUND )
+ INCLUDE(${QT_USE_FILE})
+endif()
set( localOsmSearch_SRCS
LocalOsmSearchRunner.cpp
diff --git a/src/plugins/runner/localdatabase/CMakeLists.txt \
b/src/plugins/runner/localdatabase/CMakeLists.txt index 5d78a48..c6f99e1 100644
--- a/src/plugins/runner/localdatabase/CMakeLists.txt
+++ b/src/plugins/runner/localdatabase/CMakeLists.txt
@@ -5,7 +5,9 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
${QT_INCLUDE_DIR}
)
-INCLUDE(${QT_USE_FILE})
+if( QT4_FOUND )
+ INCLUDE(${QT_USE_FILE})
+endif()
set( localdatabase_SRCS LocalDatabaseRunner.cpp LocalDatabasePlugin.cpp )
diff --git a/src/plugins/runner/log/CMakeLists.txt \
b/src/plugins/runner/log/CMakeLists.txt index d41b587..252b2a9 100644
--- a/src/plugins/runner/log/CMakeLists.txt
+++ b/src/plugins/runner/log/CMakeLists.txt
@@ -5,7 +5,9 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
${QT_INCLUDE_DIR}
)
-INCLUDE(${QT_USE_FILE})
+if( QT4_FOUND )
+ INCLUDE(${QT_USE_FILE})
+endif()
set( log_SRCS LogPlugin.cpp LogRunner.cpp )
diff --git a/src/plugins/runner/mapquest/CMakeLists.txt \
b/src/plugins/runner/mapquest/CMakeLists.txt index cc594b4..f2e146f 100644
--- a/src/plugins/runner/mapquest/CMakeLists.txt
+++ b/src/plugins/runner/mapquest/CMakeLists.txt
@@ -4,13 +4,20 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${QT_INCLUDE_DIR}
+
+ if( NOT QT4_FOUND )
+ ${Qt5WebKitWidgets_INCLUDE_DIRS}
+ ${Qt5Xml_INCLUDE_DIRS}
+ endif()
)
-INCLUDE(${QT_USE_FILE})
+if( QT4_FOUND )
+ INCLUDE(${QT_USE_FILE})
+endif()
set( mapquest_SRCS MapQuestRunner.cpp MapQuestPlugin.cpp )
set( mapquest_UI MapQuestConfigWidget.ui )
-qt4_wrap_ui( mapquest_SRCS ${mapquest_UI} )
+qt_wrap_ui( mapquest_SRCS ${mapquest_UI} )
marble_add_plugin( MapQuestPlugin ${mapquest_SRCS} )
diff --git a/src/plugins/runner/monav/CMakeLists.txt \
b/src/plugins/runner/monav/CMakeLists.txt index f129104..9422b07 100644
--- a/src/plugins/runner/monav/CMakeLists.txt
+++ b/src/plugins/runner/monav/CMakeLists.txt
@@ -4,8 +4,14 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${QT_INCLUDE_DIR}
+
+ if( NOT QT4_FOUND )
+ ${Qt5Xml_INCLUDE_DIRS}
+ endif()
)
-INCLUDE(${QT_USE_FILE})
+if( QT4_FOUND )
+ INCLUDE(${QT_USE_FILE})
+endif()
set( monav_SRCS
MonavRunner.cpp
@@ -15,7 +21,7 @@ set( monav_SRCS
MonavConfigWidget.cpp )
set( monav_UI MonavConfigWidget.ui )
-qt4_wrap_ui( monav_SRCS ${monav_UI} )
-qt4_add_resources( monav_SRCS monav.qrc )
+qt_wrap_ui( monav_SRCS ${monav_UI} )
+qt_add_resources( monav_SRCS monav.qrc )
marble_add_plugin( MonavPlugin ${monav_SRCS} )
diff --git a/src/plugins/runner/monav/MonavMapsModel.cpp \
b/src/plugins/runner/monav/MonavMapsModel.cpp index 9af5f40..2734d89 100644
--- a/src/plugins/runner/monav/MonavMapsModel.cpp
+++ b/src/plugins/runner/monav/MonavMapsModel.cpp
@@ -28,7 +28,8 @@ void MonavMapsModel::deleteMapFiles( int row )
void MonavMapsModel::setInstallableVersions( const QMap<QString, QString> remoteMaps \
) {
m_remoteMaps = remoteMaps;
- reset();
+ beginResetModel();
+ endResetModel();
}
MonavMapsModel::MonavMapsModel( const QVector<MonavMap> &data, QObject * parent ) :
diff --git a/src/plugins/runner/nominatim-reversegeocoding/CMakeLists.txt \
b/src/plugins/runner/nominatim-reversegeocoding/CMakeLists.txt index 2567c5c..9371c81 \
100644
--- a/src/plugins/runner/nominatim-reversegeocoding/CMakeLists.txt
+++ b/src/plugins/runner/nominatim-reversegeocoding/CMakeLists.txt
@@ -4,8 +4,15 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${QT_INCLUDE_DIR}
+
+ if( NOT QT4_FOUND )
+ ${Qt5WebKitWidgets_INCLUDE_DIRS}
+ ${Qt5Xml_INCLUDE_DIRS}
+ endif()
)
-INCLUDE(${QT_USE_FILE})
+if( QT4_FOUND )
+ INCLUDE(${QT_USE_FILE})
+endif()
set( nominatim_SRCS OsmNominatimReverseGeocodingRunner.cpp \
NominatimReverseGeocodingPlugin.cpp )
diff --git a/src/plugins/runner/nominatim-search/CMakeLists.txt \
b/src/plugins/runner/nominatim-search/CMakeLists.txt index 8b1ef00..51a3693 100644
--- a/src/plugins/runner/nominatim-search/CMakeLists.txt
+++ b/src/plugins/runner/nominatim-search/CMakeLists.txt
@@ -4,8 +4,15 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${QT_INCLUDE_DIR}
+
+ if( NOT QT4_FOUND )
+ ${Qt5WebKitWidgets_INCLUDE_DIRS}
+ ${Qt5Xml_INCLUDE_DIRS}
+ endif()
)
-INCLUDE(${QT_USE_FILE})
+if( QT4_FOUND )
+ INCLUDE(${QT_USE_FILE})
+endif()
set( nominatim_SRCS OsmNominatimSearchRunner.cpp NominatimSearchPlugin.cpp )
diff --git a/src/plugins/runner/open-source-routing-machine/CMakeLists.txt \
b/src/plugins/runner/open-source-routing-machine/CMakeLists.txt index \
beff781..b619a08 100644
--- a/src/plugins/runner/open-source-routing-machine/CMakeLists.txt
+++ b/src/plugins/runner/open-source-routing-machine/CMakeLists.txt
@@ -4,8 +4,15 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${QT_INCLUDE_DIR}
+
+ if( NOT QT4_FOUND )
+ ${Qt5WebKitWidgets_INCLUDE_DIRS}
+ ${Qt5Xml_INCLUDE_DIRS}
+ endif()
)
-INCLUDE(${QT_USE_FILE})
+if( QT4_FOUND )
+ INCLUDE(${QT_USE_FILE})
+endif()
set( osrm_SRCS OSRMRunner.cpp OSRMPlugin.cpp )
diff --git a/src/plugins/runner/open-source-routing-machine/OSRMRunner.cpp \
b/src/plugins/runner/open-source-routing-machine/OSRMRunner.cpp index \
14ac758..8f6c7f5 100644
--- a/src/plugins/runner/open-source-routing-machine/OSRMRunner.cpp
+++ b/src/plugins/runner/open-source-routing-machine/OSRMRunner.cpp
@@ -144,7 +144,7 @@ GeoDataLineString *OSRMRunner::decodePolyline( const QString \
&geometry ) const for ( int j=0; j<2; ++j ) { // lat and lon
int block( 0 ), shift( 0 ), result( 0 );
do {
- block = geometry.at( i++ /* increment for outer loop */ ).toAscii() \
- 63; + block = geometry.at( i++ /* increment for outer loop */ \
).toLatin1() - 63; result |= ( block & 0x1F ) << shift;
shift += 5;
} while ( block >= 0x20 );
diff --git a/src/plugins/runner/openrouteservice/CMakeLists.txt \
b/src/plugins/runner/openrouteservice/CMakeLists.txt index 60184ef..e5de76c 100644
--- a/src/plugins/runner/openrouteservice/CMakeLists.txt
+++ b/src/plugins/runner/openrouteservice/CMakeLists.txt
@@ -4,13 +4,20 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${QT_INCLUDE_DIR}
+
+ if( NOT QT4_FOUND )
+ ${Qt5WebKitWidgets_INCLUDE_DIRS}
+ ${Qt5Xml_INCLUDE_DIRS}
+ endif()
)
-INCLUDE(${QT_USE_FILE})
+if( QT4_FOUND )
+ INCLUDE(${QT_USE_FILE})
+endif()
set( openrouteservice_SRCS OpenRouteServiceRunner.cpp OpenRouteServicePlugin.cpp )
set( openrouteservice_UI OpenRouteServiceConfigWidget.ui )
-qt4_wrap_ui( openrouteservice_SRCS ${openrouteservice_UI} )
+qt_wrap_ui( openrouteservice_SRCS ${openrouteservice_UI} )
marble_add_plugin( OpenRouteServicePlugin ${openrouteservice_SRCS} )
diff --git a/src/plugins/runner/osm/CMakeLists.txt \
b/src/plugins/runner/osm/CMakeLists.txt index d2cf23a..392b2cf 100644
--- a/src/plugins/runner/osm/CMakeLists.txt
+++ b/src/plugins/runner/osm/CMakeLists.txt
@@ -6,7 +6,9 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
${QT_INCLUDE_DIR}
)
-INCLUDE(${QT_USE_FILE})
+if( QT4_FOUND )
+ INCLUDE(${QT_USE_FILE})
+endif()
set( osm_handlers_SRCS
handlers/OsmBoundsTagHandler.cpp
diff --git a/src/plugins/runner/pn2/CMakeLists.txt \
b/src/plugins/runner/pn2/CMakeLists.txt index bcd273a..6c80968 100644
--- a/src/plugins/runner/pn2/CMakeLists.txt
+++ b/src/plugins/runner/pn2/CMakeLists.txt
@@ -5,7 +5,9 @@ INCLUDE_DIRECTORIES(
${CMAKE_BINARY_DIR}/src/plugins/runner/pn2
${QT_INCLUDE_DIR}
)
-INCLUDE(${QT_USE_FILE})
+if( QT4_FOUND )
+ INCLUDE(${QT_USE_FILE})
+endif()
set( pn2_SRCS Pn2Plugin.cpp Pn2Runner.cpp )
diff --git a/src/plugins/runner/pnt/CMakeLists.txt \
b/src/plugins/runner/pnt/CMakeLists.txt index b52f461..9a00c57 100644
--- a/src/plugins/runner/pnt/CMakeLists.txt
+++ b/src/plugins/runner/pnt/CMakeLists.txt
@@ -5,7 +5,9 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
${QT_INCLUDE_DIR}
)
-INCLUDE(${QT_USE_FILE})
+if( QT4_FOUND )
+ INCLUDE(${QT_USE_FILE})
+endif()
set( pnt_SRCS PntPlugin.cpp PntRunner.cpp )
diff --git a/src/plugins/runner/routino/CMakeLists.txt \
b/src/plugins/runner/routino/CMakeLists.txt index 49bb68e..6ba9ecf 100644
--- a/src/plugins/runner/routino/CMakeLists.txt
+++ b/src/plugins/runner/routino/CMakeLists.txt
@@ -5,12 +5,14 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
${QT_INCLUDE_DIR}
)
-INCLUDE(${QT_USE_FILE})
+if( QT4_FOUND )
+ INCLUDE(${QT_USE_FILE})
+endif()
set( routino_SRCS RoutinoRunner.cpp RoutinoPlugin.cpp )
set( routino_UI RoutinoConfigWidget.ui )
-qt4_wrap_ui( routino_SRCS ${routino_UI} )
+qt_wrap_ui( routino_SRCS ${routino_UI} )
marble_add_plugin( RoutinoPlugin ${routino_SRCS} )
diff --git a/src/plugins/runner/yours/CMakeLists.txt \
b/src/plugins/runner/yours/CMakeLists.txt index 2cab1e5..1752413 100644
--- a/src/plugins/runner/yours/CMakeLists.txt
+++ b/src/plugins/runner/yours/CMakeLists.txt
@@ -4,8 +4,15 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${QT_INCLUDE_DIR}
+
+ if( NOT QT4_FOUND )
+ ${Qt5WebKitWidgets_INCLUDE_DIRS}
+ ${Qt5Xml_INCLUDE_DIRS}
+ endif()
)
-INCLUDE(${QT_USE_FILE})
+if( QT4_FOUND )
+ INCLUDE(${QT_USE_FILE})
+endif()
set( yours_SRCS YoursRunner.cpp YoursPlugin.cpp )
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic