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

List:       kde-commits
Subject:    [marble/qt5] /: Merge branch 'master' into qt5
From:       Michael Zanetti <mzanetti () kde ! org>
Date:       2013-08-29 19:55:16
Message-ID: E1VF8JI-0007dx-0r () scm ! kde ! org
[Download RAW message or body]

Git commit 22cd33d62badb8f1650223d8e12e5561cc1562b5 by Michael Zanetti.
Committed on 29/08/2013 at 19:38.
Pushed by mzanetti into branch 'qt5'.

Merge branch 'master' into qt5

Conflicts:
	MarbleMacros.cmake
	src/CMakeLists.txt
	src/lib/CMakeLists.txt
	src/plugins/render/earthquake/CMakeLists.txt
	src/plugins/render/elevationprofilefloatitem/CMakeLists.txt
	src/plugins/render/elevationprofilemarker/CMakeLists.txt
	src/plugins/render/navigation/CMakeLists.txt
	src/plugins/render/opendesktop/CMakeLists.txt

M  +5    -0    CMakeLists.txt
M  +3    -2    src/CMakeLists.txt
M  +25   -0    src/marble-mobile/CMakeLists.txt
M  +0    -8    src/qtmain.cpp

http://commits.kde.org/marble/22cd33d62badb8f1650223d8e12e5561cc1562b5

diff --cc CMakeLists.txt
index 3e426c8,a740667..25094ff
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -252,50 -250,32 +252,55 @@@ endif(APPLE
  ####################################################
  # Specific options for if building with Qt or kde4 libs
  
 -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 )
 -set( QT_USE_QTDBUS        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_FOUND )
 -  # older cmake versions have a FindQt4.cmake without support for declarative,
 -  # but the library may still be available
 -  FIND_PACKAGE(QtDeclarative)
 -  include_directories(${QT_QTDECLARATIVE_INCLUDE_DIR})
 -ENDIF()
 +if(QT5BUILD)
 +  find_package(Qt5Core REQUIRED)
 +  find_package(Qt5Xml REQUIRED)
 +  find_package(Qt5Network REQUIRED)
 +  find_package(Qt5Test REQUIRED)
 +  find_package(Qt5Script REQUIRED)
 +  find_package(Qt5Widgets REQUIRED)
 +  find_package(Qt5WebKitWidgets REQUIRED)
 +  find_package(Qt5Svg REQUIRED)
 +  find_package(Qt5Sql REQUIRED)
 +  find_package(Qt5Concurrent REQUIRED)
 +  find_package(Qt5PrintSupport REQUIRED)
 +
 +  include_directories( ${Qt5Svg_INCLUDE_DIRS} )
 +  include_directories( ${Qt5PrintSupport_INCLUDE_DIRS} )
 +  include_directories( ${Qt5Network_INCLUDE_DIRS} )
 +  include_directories( ${Qt5Script_INCLUDE_DIRS} )
 +
 +  SET(CMAKE_AUTOMOC TRUE)
 +  SET(CMAKE_AUTOMOC_RELAXED_MODE TRUE)
 +
 +else(QT5BUILD)
 +  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 )
 +  set( QT_USE_QTDBUS        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_PACKAGE(QtDeclarative)
 +    include_directories(${QT_QTDECLARATIVE_INCLUDE_DIR})
 +  ENDIF()
 +endif()
  
+ if( NOT ${CMAKE_VERSION} STRLESS "2.8" AND NOT QT4_FOUND)
+   SET(CMAKE_AUTOMOC TRUE)
+   SET(CMAKE_AUTOMOC_RELAXED_MODE TRUE)
+ endif()
+ 
  if(QTONLY)
    # add a flag to be able to distinguish between qt 
    # and kde mode in the sources
diff --cc src/marble-mobile/CMakeLists.txt
index 0000000,961a289..f5fd71c
mode 000000,100644..100644
--- a/src/marble-mobile/CMakeLists.txt
+++ b/src/marble-mobile/CMakeLists.txt
@@@ -1,0 -1,23 +1,25 @@@
+ project( marble-mobile )
+ 
+ include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}/..
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${QT_INCLUDE_DIR}
+ )
 -include(${QT_USE_FILE})
++if( QT4_FOUND )
++  include(${QT_USE_FILE})
++endif()
+ 
+ set( marblemobile_SRCS
+   main.cpp
+   MobileMainWindow.cpp
+   StackableWindow.cpp
+   ../MarbleTest.cpp
+ )
+ 
+ add_definitions(-DMARBLE_MOBILE_VERSION_STRING="1.6.20")
+ 
+ marble_qt4_automoc( ${marblemobile_SRCS} )
+ add_executable( marble-mobile ${marblemobile_SRCS} )
+ target_link_libraries( marble-mobile ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} \
${QT_QTMAIN_LIBRARY} marblewidget ) + install( TARGETS marble-mobile RUNTIME \
DESTINATION ${CMAKE_INSTALL_PREFIX}/bin )


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