[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [marble/qt5] src/plugins: all plugins ported to Qt5 (components plugin's QML files not ported yet)
From:       Michael Zanetti <mzanetti () kde ! org>
Date:       2013-08-29 20:06:20
Message-ID: E1VF8U0-0005kH-7s () scm ! kde ! org
[Download RAW message or body]

Git commit f5b7e6ac3674b475e22d96169b59aec7dd89d777 by Michael Zanetti.
Committed on 29/08/2013 at 20:05.
Pushed by mzanetti into branch 'qt5'.

all plugins ported to Qt5 (components plugin's QML files not ported yet)

M  +5    -5    src/plugins/CMakeLists.txt
M  +3    -1    src/plugins/positionprovider/flightgear/CMakeLists.txt
M  +3    -2    src/plugins/positionprovider/gpsd/CMakeLists.txt
M  +3    -2    src/plugins/positionprovider/placemark/CMakeLists.txt
M  +3    -2    src/plugins/positionprovider/routesimulation/CMakeLists.txt
M  +4    -2    src/plugins/qt-components/CMakeLists.txt
M  +12   -1    src/plugins/qt-components/QtComponentsPlugin.h

http://commits.kde.org/marble/f5b7e6ac3674b475e22d96169b59aec7dd89d777

diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
index 014bff1..f28d7e9 100644
--- a/src/plugins/CMakeLists.txt
+++ b/src/plugins/CMakeLists.txt
@@ -2,9 +2,9 @@ add_subdirectory( designer )
 add_subdirectory( declarative )
 add_subdirectory( render )
 add_subdirectory( runner )
-#add_subdirectory( templates )
-#add_subdirectory( positionprovider )
+add_subdirectory( templates )
+add_subdirectory( positionprovider )
 =

-#if( QT_QTDECLARATIVE_FOUND )
-#    add_subdirectory( qt-components )
-#endif( QT_QTDECLARATIVE_FOUND )
+if( QT_QTDECLARATIVE_FOUND OR QT5BUILD )
+    add_subdirectory( qt-components )
+endif()
diff --git a/src/plugins/positionprovider/flightgear/CMakeLists.txt b/src/p=
lugins/positionprovider/flightgear/CMakeLists.txt
index d1a7772..6fbe63a 100644
--- a/src/plugins/positionprovider/flightgear/CMakeLists.txt
+++ b/src/plugins/positionprovider/flightgear/CMakeLists.txt
@@ -6,7 +6,9 @@ INCLUDE_DIRECTORIES(
  ${QT_INCLUDE_DIR}
 )
 set( QT_USE_QTNETWORK  ON )
-INCLUDE(${QT_USE_FILE})
+if( QT4_FOUND )
+  INCLUDE(${QT_USE_FILE})
+endif()
 =

 set( flightgear_SRCS FlightGearPositionProviderPlugin.cpp )
 set( FlightGearPositionProviderPlugin_LIBS )
diff --git a/src/plugins/positionprovider/gpsd/CMakeLists.txt b/src/plugins=
/positionprovider/gpsd/CMakeLists.txt
index 02a86c0..6d5ece2 100644
--- a/src/plugins/positionprovider/gpsd/CMakeLists.txt
+++ b/src/plugins/positionprovider/gpsd/CMakeLists.txt
@@ -6,8 +6,9 @@ INCLUDE_DIRECTORIES(
  ${QT_INCLUDE_DIR}
  ${LIBGPS_INCLUDE_DIR}
 )
-
-include(${QT_USE_FILE})
+if( QT4_FOUND )
+  include(${QT_USE_FILE})
+endif()
 =

 set( gpsd_SRCS
  GpsdConnection.cpp
diff --git a/src/plugins/positionprovider/placemark/CMakeLists.txt b/src/pl=
ugins/positionprovider/placemark/CMakeLists.txt
index 6c27c96..3b1164d 100644
--- a/src/plugins/positionprovider/placemark/CMakeLists.txt
+++ b/src/plugins/positionprovider/placemark/CMakeLists.txt
@@ -5,8 +5,9 @@ INCLUDE_DIRECTORIES(
  ${CMAKE_CURRENT_BINARY_DIR}
  ${QT_INCLUDE_DIR}
 )
-
-include(${QT_USE_FILE})
+if( QT4_FOUND )
+  include(${QT_USE_FILE})
+endif()
 =

 set( placemark_SRCS
  PlacemarkPositionProviderPlugin.cpp
diff --git a/src/plugins/positionprovider/routesimulation/CMakeLists.txt b/=
src/plugins/positionprovider/routesimulation/CMakeLists.txt
index 82f4c8f..b352b6e 100644
--- a/src/plugins/positionprovider/routesimulation/CMakeLists.txt
+++ b/src/plugins/positionprovider/routesimulation/CMakeLists.txt
@@ -5,8 +5,9 @@ INCLUDE_DIRECTORIES(
  ${CMAKE_CURRENT_BINARY_DIR}
  ${QT_INCLUDE_DIR}
 )
-
-include(${QT_USE_FILE})
+if( QT4_FOUND )
+  include(${QT_USE_FILE})
+endif()
 =

 set( the_SRCS
  RouteSimulationPositionProviderPlugin.cpp
diff --git a/src/plugins/qt-components/CMakeLists.txt b/src/plugins/qt-comp=
onents/CMakeLists.txt
index e2db1bf..bdaf58d 100644
--- a/src/plugins/qt-components/CMakeLists.txt
+++ b/src/plugins/qt-components/CMakeLists.txt
@@ -6,19 +6,21 @@ INCLUDE_DIRECTORIES(
  ${CMAKE_CURRENT_SOURCE_DIR}
  ${CMAKE_CURRENT_BINARY_DIR}
  ${QT_INCLUDE_DIR}
+
+ ${Qt5Qml_INCLUDE_DIRS}
 )
 =

 set( my_SRCS
 QtComponentsPlugin.cpp
 )
 =

-QT4_ADD_RESOURCES(my_SRCS qtcomponents.qrc)
+QT_ADD_RESOURCES(my_SRCS qtcomponents.qrc)
 =

 FILE (GLOB QML_FILES *.qml)
 marble_add_project_resources(${QML_FILES} qmldir)
 =

 MARBLE_ADD_DECLARATIVE_PLUGIN( QtComponentsPlugin qtcomponents ${my_SRCS} )
-QT4_AUTOMOC(${my_SRCS})
+MARBLE_QT4_AUTOMOC(${my_SRCS})
 TARGET_LINK_LIBRARIES( QtComponentsPlugin ${QT_QTDECLARATIVE_LIBRARY} ${QT=
_QTWEBKIT_LIBRARY} )
 INSTALL( FILES qmldir DESTINATION ${MARBLE_QT_IMPORTS_DIR}/org/kde/edu/mar=
ble/qtcomponents )
 INSTALL( FILES SearchField.qml DESTINATION ${MARBLE_QT_IMPORTS_DIR}/org/kd=
e/edu/marble/qtcomponents )
diff --git a/src/plugins/qt-components/QtComponentsPlugin.h b/src/plugins/q=
t-components/QtComponentsPlugin.h
index ac6fae7..fca09d6 100644
--- a/src/plugins/qt-components/QtComponentsPlugin.h
+++ b/src/plugins/qt-components/QtComponentsPlugin.h
@@ -11,12 +11,23 @@
 #ifndef MARBLE_QTCOMPONENTS_PLUGIN_H
 #define MARBLE_QTCOMPONENTS_PLUGIN_H
 =

-#include <QDeclarativeExtensionPlugin>
+#include <qglobal.h>
+#include <marble_export.h>
+
+#if QT_VERSION < 0x050000
+  #include <QDeclarativeExtensionPlugin>
+#else
+  #include <QQmlExtensionPlugin>
+#endif
 =

 /**
  * Dummy class to export plugin.
  */
+#if QT_VERSION < 0x050000
 class QtComponentsPlugin : public QDeclarativeExtensionPlugin
+#else
+class QtComponentsPlugin : public QQmlExtensionPlugin
+#endif
 {
     Q_OBJECT
     Q_PLUGIN_METADATA( IID "org.kde.edu.marble.QtComponentsPlugin" )
[prev in list] [next in list] [prev in thread] [next in thread]