@@ -246,47 +246,28 @@ ELSE (WITH_QTWEBKIT)
246
246
MESSAGE (STATUS "Qt WebKit support DISABLED." )
247
247
ENDIF (WITH_QTWEBKIT)
248
248
#############################################################
249
- # search for Qt4
250
- SET (QT_MIN_VERSION 4.8.0)
251
- SET (ENABLE_QT5 FALSE CACHE BOOL "If enabled will try to find Qt5 before looking for Qt4" )
252
- IF (ENABLE_QT5)
253
- FIND_PACKAGE (Qt5Core QUIET )
254
- FIND_PACKAGE (Qt5Gui REQUIRED)
255
- FIND_PACKAGE (Qt5Widgets REQUIRED)
256
- FIND_PACKAGE (Qt5Network REQUIRED)
257
- FIND_PACKAGE (Qt5Xml REQUIRED)
258
- FIND_PACKAGE (Qt5Svg REQUIRED)
259
- FIND_PACKAGE (Qt5Concurrent REQUIRED)
260
- FIND_PACKAGE (Qt5PrintSupport REQUIRED)
261
- FIND_PACKAGE (Qt5Positioning)
262
- IF (WITH_QTWEBKIT)
263
- FIND_PACKAGE (Qt5WebKit REQUIRED)
264
- FIND_PACKAGE (Qt5WebKitWidgets REQUIRED)
265
- ENDIF (WITH_QTWEBKIT)
266
- FIND_PACKAGE (Qt5Test REQUIRED)
267
- FIND_PACKAGE (Qt5UiTools REQUIRED)
268
- FIND_PACKAGE (Qt5Script REQUIRED)
269
- FIND_PACKAGE (Qt5Sql REQUIRED)
270
- SET (QT5_BUILD TRUE )
271
- INCLUDE ("cmake/modules/ECMQt4To5Porting.cmake" )
272
- MESSAGE (STATUS "Found Qt version: ${Qt5Core_VERSION_STRING} " )
273
- ELSE ()
274
- FIND_PACKAGE (Qt4 ${QT_MIN_VERSION} REQUIRED)
275
- SET (QT_USE_QTXML 1)
276
- SET (QT_USE_QTNETWORK 1)
277
- SET (QT_USE_QTSVG 1)
278
- SET (QT_USE_QTSQL 1)
279
- IF (WITH_QTWEBKIT)
280
- SET (QT_USE_QTWEBKIT 1)
281
- ENDIF (WITH_QTWEBKIT)
282
- IF (NOT QT_QTXML_FOUND OR NOT QT_QTNETWORK_FOUND OR NOT QT_QTSVG_FOUND OR NOT QT_QTSQL_FOUND OR (WITH_QTWEBKIT AND NOT QT_QTWEBKIT_FOUND) OR (WITH_CUSTOM_WIDGETS AND NOT QT_QTDESIGNER_FOUND))
283
- MESSAGE (SEND_ERROR "Some Qt4 modules haven't been found!" )
284
- ENDIF (NOT QT_QTXML_FOUND OR NOT QT_QTNETWORK_FOUND OR NOT QT_QTSVG_FOUND OR NOT QT_QTSQL_FOUND OR (WITH_QTWEBKIT AND NOT QT_QTWEBKIT_FOUND) OR (WITH_CUSTOM_WIDGETS AND NOT QT_QTDESIGNER_FOUND))
285
-
286
- INCLUDE ( ${QT_USE_FILE} )
287
-
288
- MESSAGE (STATUS "Found Qt version: ${QTVERSION} " )
289
- ENDIF ()
249
+ # search for Qt5
250
+ SET (QT_MIN_VERSION 5.5.0)
251
+ FIND_PACKAGE (Qt5Core QUIET )
252
+ FIND_PACKAGE (Qt5Gui REQUIRED)
253
+ FIND_PACKAGE (Qt5Widgets REQUIRED)
254
+ FIND_PACKAGE (Qt5Network REQUIRED)
255
+ FIND_PACKAGE (Qt5Xml REQUIRED)
256
+ FIND_PACKAGE (Qt5Svg REQUIRED)
257
+ FIND_PACKAGE (Qt5Concurrent REQUIRED)
258
+ FIND_PACKAGE (Qt5PrintSupport REQUIRED)
259
+ FIND_PACKAGE (Qt5Positioning)
260
+ IF (WITH_QTWEBKIT)
261
+ FIND_PACKAGE (Qt5WebKit REQUIRED)
262
+ FIND_PACKAGE (Qt5WebKitWidgets REQUIRED)
263
+ ENDIF (WITH_QTWEBKIT)
264
+ FIND_PACKAGE (Qt5Test REQUIRED)
265
+ FIND_PACKAGE (Qt5UiTools REQUIRED)
266
+ FIND_PACKAGE (Qt5Script REQUIRED)
267
+ FIND_PACKAGE (Qt5Sql REQUIRED)
268
+ SET (QT5_BUILD TRUE )
269
+ INCLUDE ("cmake/modules/ECMQt4To5Porting.cmake" )
270
+ MESSAGE (STATUS "Found Qt version: ${Qt5Core_VERSION_STRING} " )
290
271
291
272
IF (WITH_QTMOBILITY)
292
273
FIND_PACKAGE (QtMobility 1.1.0)
@@ -690,7 +671,7 @@ IF (UNIX AND NOT APPLE)
690
671
SET (QGIS_MANUAL_DIR ${CMAKE_INSTALL_PREFIX} /${QGIS_MANUAL_SUBDIR} )
691
672
ENDIF (UNIX AND NOT APPLE )
692
673
693
- SET (DISABLE_DEPRECATED ${ENABLE_QT5} CACHE BOOL "If set to true, it will disable deprecated functionality to prepare for the next generation of QGIS" )
674
+ SET (DISABLE_DEPRECATED FALSE CACHE BOOL "If set to true, it will disable deprecated functionality to prepare for the next generation of QGIS" )
694
675
IF (DISABLE_DEPRECATED)
695
676
ADD_DEFINITIONS (-DQGIS_DISABLE_DEPRECATED)
696
677
ENDIF (DISABLE_DEPRECATED)
@@ -699,12 +680,7 @@ ENDIF (DISABLE_DEPRECATED)
699
680
#############################################################
700
681
# Python build dependency
701
682
702
- SET (ENABLE_PYTHON3 ${ENABLE_QT5} CACHE BOOL "If enabled will try to find Python 3 before looking for Python 2" )
703
- IF (ENABLE_PYTHON3)
704
- SET (PYTHON_VER 3 CACHE STRING "Python version" )
705
- ELSE (ENABLE_PYTHON3)
706
- SET (PYTHON_VER 2.7 CACHE STRING "Python version" )
707
- ENDIF (ENABLE_PYTHON3)
683
+ SET (PYTHON_VER 3 CACHE STRING "Python version" )
708
684
709
685
FIND_PACKAGE (PythonInterp ${PYTHON_VER} REQUIRED)
710
686
@@ -715,17 +691,10 @@ IF (WITH_BINDINGS)
715
691
716
692
FIND_PACKAGE (PythonLibrary REQUIRED)
717
693
718
- # python support: check for interpreter, sip, pyqt4
719
- IF (ENABLE_QT5)
720
- FIND_PACKAGE (PyQt5 REQUIRED)
721
- SET (PYQT_SIP_FLAGS ${PYQT5_SIP_FLAGS} )
722
- SET (PYQT_SIP_DIR ${PYQT5_SIP_DIR} )
723
- ELSE (ENABLE_QT5)
724
- FIND_PACKAGE (PyQt4 REQUIRED)
725
- # setup SIP variables
726
- SET (PYQT_SIP_FLAGS ${PYQT4_SIP_FLAGS} )
727
- SET (PYQT_SIP_DIR ${PYQT4_SIP_DIR} )
728
- ENDIF (ENABLE_QT5)
694
+ # python support: check for interpreter, sip, pyqt5
695
+ FIND_PACKAGE (PyQt5 REQUIRED)
696
+ SET (PYQT_SIP_FLAGS ${PYQT5_SIP_FLAGS} )
697
+ SET (PYQT_SIP_DIR ${PYQT5_SIP_DIR} )
729
698
SEPARATE_ARGUMENTS (PYQT_SIP_FLAGS) # convert space separated values to a list
730
699
731
700
FIND_PACKAGE (SIP REQUIRED)
@@ -742,11 +711,7 @@ IF (WITH_BINDINGS)
742
711
ENDIF (NOT BINDINGS_GLOBAL_INSTALL)
743
712
744
713
IF (WITH_CUSTOM_WIDGETS)
745
- IF (ENABLE_QT5)
746
- SET (PYUIC_WIDGET_PLUGIN_DIRECTORY ${PYQT5_MOD_DIR} /uic/widget-plugins/)
747
- ELSE (ENABLE_QT5)
748
- SET (PYUIC_WIDGET_PLUGIN_DIRECTORY ${PYQT4_MOD_DIR} /uic/widget-plugins/)
749
- ENDIF (ENABLE_QT5)
714
+ SET (PYUIC_WIDGET_PLUGIN_DIRECTORY ${PYQT5_MOD_DIR} /uic/widget-plugins/)
750
715
ENDIF (WITH_CUSTOM_WIDGETS)
751
716
752
717
ENDIF (WITH_BINDINGS)
0 commit comments