Skip to content
Permalink
Browse files
Merge pull request #3510 from nyalldawson/qt5_tests 
Require python 3 and qt5
  • Loading branch information
@nyalldawson
nyalldawson committed Sep 20, 2016
2 parents 03923eb + ee57c1f commit cbff8f42a5849dd262b318b66d2c7ef958791251
Showing with 1,956 additions and 2,470 deletions.
  1. +4 −60 .travis.yml
  2. +28 −70 CMakeLists.txt
  3. +0 −2 ci/travis/linux/qt5/blacklist.txt
  4. +0 −2 ci/travis/linux/qt5/install.sh
  5. +1 −5 cmake/FindPythonLibrary.cmake
  6. +1 −5 cmake/FindQCA.cmake
  7. +1 −5 cmake/FindQScintilla.cmake
  8. +5 −16 cmake/FindQsci.cmake
  9. +1 −5 cmake/FindQwt.cmake
  10. +3 −9 cmake/PyQtMacros.cmake
  11. +0 −2 cmake_templates/qgsconfig.h.in
  12. +1 −0 doc/api_break.dox
  13. +0 −7 python/CMakeLists.txt
  14. +1 −5 python/PyQt/CMakeLists.txt
  15. +2 −6 python/core/composer/qgscomposerscalebar.sip
  16. +2 −9 python/core/core.sip
  17. +0 −6 python/core/geometry/qgsgeometry.sip
  18. +0 −97 python/core/qgshttptransaction.sip
  19. +2 −2 python/core/qgsmaplayermodel.sip
  20. +5 −7 python/core/qgsproviderregistry.sip
  21. +1 −32 python/ext-libs/CMakeLists.txt
  22. +1 −6 python/gui/gui.sip
  23. +14 −17 python/plugins/CMakeLists.txt
  24. +1 −1 src/analysis/CMakeLists.txt
  25. +1 −1 src/analysis/network/CMakeLists.txt
  26. +3 −3 src/app/CMakeLists.txt
  27. +0 −11 src/app/main.cpp
  28. +0 −13 src/app/qgisapp.cpp
  29. +2 −2 src/auth/basic/CMakeLists.txt
  30. +2 −2 src/auth/identcert/CMakeLists.txt
  31. +2 −2 src/auth/pkipaths/CMakeLists.txt
  32. +2 −2 src/auth/pkipkcs12/CMakeLists.txt
  33. +4 −4 src/browser/CMakeLists.txt
  34. +6 −13 src/core/CMakeLists.txt
  35. +0 −2 src/core/auth/qgsauthcertutils.cpp
  36. +0 −8 src/core/auth/qgsauthcertutils.h
  37. +1 −1 src/core/composer/qgscomposerscalebar.h
  38. +0 −2 src/core/dxf/qgsdxfpaintdevice.cpp
  39. +0 −40 src/core/qgis.h
  40. +0 −8 src/core/qgsexpression.cpp
  41. +0 −2 src/core/qgsmaplayermodel.cpp
  42. +0 −2 src/core/qgsmaplayermodel.h
  43. +0 −20 src/core/qgsproviderregistry.cpp
  44. +0 −10 src/core/qgsproviderregistry.h
  45. +0 −5 src/core/qgsstringutils.cpp
  46. +4 −6 src/customwidgets/CMakeLists.txt
  47. +1 −1 src/gui/CMakeLists.txt
  48. +0 −2 src/gui/auth/qgsauthsslconfigwidget.cpp
  49. +0 −8 src/gui/qgsattributeform.cpp
  50. +0 −4 src/gui/qgscolorschemelist.cpp
  51. +0 −4 src/gui/qgstablewidgetitem.cpp
  52. +3 −3 src/helpviewer/CMakeLists.txt
  53. +3 −3 src/plugins/compass/CMakeLists.txt
  54. +3 −3 src/plugins/coordinate_capture/CMakeLists.txt
  55. +3 −3 src/plugins/dxf2shp_converter/CMakeLists.txt
  56. +3 −3 src/plugins/evis/CMakeLists.txt
  57. +3 −3 src/plugins/geometry_checker/CMakeLists.txt
  58. +3 −3 src/plugins/geometry_snapper/CMakeLists.txt
  59. +3 −3 src/plugins/georeferencer/CMakeLists.txt
  60. +3 −3 src/plugins/globe/CMakeLists.txt
  61. +1 −1 src/plugins/globe/featuresource/CMakeLists.txt
  62. +3 −3 src/plugins/gps_importer/CMakeLists.txt
  63. +3 −3 src/plugins/grass/CMakeLists.txt
  64. +1 −1 src/plugins/grass/qtermwidget/Session.cpp
  65. +3 −3 src/plugins/heatmap/CMakeLists.txt
  66. +3 −3 src/plugins/interpolation/CMakeLists.txt
  67. +3 −3 src/plugins/offline_editing/CMakeLists.txt
  68. +3 −3 src/plugins/oracle_raster/CMakeLists.txt
  69. +3 −3 src/plugins/plugin_template/CMakeLists.txt
  70. +3 −3 src/plugins/raster_terrain_analysis/CMakeLists.txt
  71. +2 −2 src/plugins/roadgraph/CMakeLists.txt
  72. +3 −3 src/plugins/spatialquery/CMakeLists.txt
  73. +3 −3 src/plugins/topology/CMakeLists.txt
  74. +3 −3 src/plugins/zonal_statistics/CMakeLists.txt
  75. +1 −3 src/providers/CMakeLists.txt
  76. +2 −9 src/providers/arcgisrest/CMakeLists.txt
  77. +0 −1 src/providers/arcgisrest/qgsafsprovider.cpp
  78. +7 −6 src/providers/arcgisrest/qgsamsprovider.cpp
  79. +8 −8 src/providers/arcgisrest/qgsarcgisrestutils.cpp
  80. +1 −1 src/providers/db2/CMakeLists.txt
  81. +1 −1 src/providers/delimitedtext/CMakeLists.txt
  82. +0 −6 src/providers/delimitedtext/qgsdelimitedtextprovider.cpp
  83. +1 −1 src/providers/gdal/CMakeLists.txt
  84. +1 −1 src/providers/gpx/CMakeLists.txt
  85. +3 −3 src/providers/grass/CMakeLists.txt
  86. +1 −1 src/providers/memory/CMakeLists.txt
  87. +1 −1 src/providers/mssql/CMakeLists.txt
  88. +1 −1 src/providers/ogr/CMakeLists.txt
  89. +1 −1 src/providers/oracle/CMakeLists.txt
  90. +1 −1 src/providers/oracle/ocispatial/CMakeLists.txt
  91. +1 −1 src/providers/ows/CMakeLists.txt
  92. +1 −1 src/providers/postgres/CMakeLists.txt
  93. +0 −74 src/providers/postgres/qgspostgresprovider.cpp
  94. +1 −1 src/providers/spatialite/CMakeLists.txt
  95. +1 −1 src/providers/spatialite/qspatialite/CMakeLists.txt
  96. +3 −3 src/providers/virtual/CMakeLists.txt
  97. +1 −1 src/providers/wcs/CMakeLists.txt
  98. +1 −1 src/providers/wfs/CMakeLists.txt
  99. +2 −4 src/providers/wms/CMakeLists.txt
  100. +6 −4 src/server/CMakeLists.txt
  101. +4 −0 src/{core → server}/qgshttptransaction.cpp
  102. +8 −2 src/{core → server}/qgshttptransaction.h
  103. +2 −0 src/server/qgsserver.cpp
  104. +1 −1 src/ui/CMakeLists.txt
  105. +1 −1 tests/bench/CMakeLists.txt
  106. +0 −4 tests/src/core/testqgsauthconfig.cpp
  107. +0 −2 tests/src/core/testqgsogcutils.cpp
  108. +3 −3 tests/src/gui/CMakeLists.txt
  109. +1 −1 tests/src/providers/CMakeLists.txt
  110. +1 −1 tests/src/python/offlineditingtestbase.py
  111. +4 −4 tests/src/python/providertestbase.py
  112. +17 −13 tests/src/python/qgis_local_server.py
  113. +3 −3 tests/src/python/qgis_wrapped_server.py
  114. +1 −1 tests/src/python/test_offline_editing_wfs.py
  115. +4 −4 tests/src/python/test_provider_db2.py
  116. +8 −8 tests/src/python/test_provider_memory.py
  117. +3 −3 tests/src/python/test_provider_mssql.py
  118. +8 −8 tests/src/python/test_provider_ogr.py
  119. +3 −3 tests/src/python/test_provider_ogr_gpkg.py
  120. +1 −1 tests/src/python/test_provider_ogr_sqlite.py
  121. +3 −3 tests/src/python/test_provider_oracle.py
  122. +8 −8 tests/src/python/test_provider_postgres.py
  123. +33 −33 tests/src/python/test_provider_shapefile.py
  124. +3 −3 tests/src/python/test_provider_spatialite.py
  125. +6 −6 tests/src/python/test_provider_tabfile.py
  126. +14 −14 tests/src/python/test_provider_virtual.py
  127. +37 −37 tests/src/python/test_provider_wfs.py
  128. +2 −2 tests/src/python/test_qgis_local_server.py
  129. +4 −4 tests/src/python/test_qgsappstartup.py
  130. +4 −4 tests/src/python/test_qgsattributeformeditorwidget.py
  131. +6 −6 tests/src/python/test_qgsattributetablemodel.py
  132. +1 −1 tests/src/python/test_qgsauthsystem.py
  133. +2 −2 tests/src/python/test_qgscomposerpicture.py
  134. +33 −32 tests/src/python/test_qgsdelimitedtextprovider.py
  135. +1,051 −1,051 tests/src/python/test_qgsdelimitedtextprovider_wanted.py
  136. +37 −37 tests/src/python/test_qgsdistancearea.py
  137. +13 −13 tests/src/python/test_qgsdoccoverage.py
  138. +3 −3 tests/src/python/test_qgsexpression.py
  139. +5 −5 tests/src/python/test_qgsfeatureiterator.py
  140. +2 −2 tests/src/python/test_qgsgeometry.py
  141. +1 −1 tests/src/python/test_qgsmaplayerregistry.py
  142. +9 −8 tests/src/python/test_qgsnetworkcontentfetcher.py
  143. +4 −4 tests/src/python/test_qgsoptional.py
  144. +4 −3 tests/src/python/test_qgspallabeling_base.py
  145. +1 −1 tests/src/python/test_qgspallabeling_composer.py
  146. +6 −6 tests/src/python/test_qgspallabeling_placement.py
  147. +2 −2 tests/src/python/test_qgspallabeling_server.py
  148. +7 −7 tests/src/python/test_qgsproject.py
  149. +1 −1 tests/src/python/test_qgsrectangle.py
  150. +2 −2 tests/src/python/test_qgsrelation.py
  151. +1 −1 tests/src/python/test_qgsrelationeditwidget.py
  152. +1 −1 tests/src/python/test_qgsrelationmanager.py
  153. +98 −98 tests/src/python/test_qgssearchwidgetwrapper.py
  154. +26 −21 tests/src/python/test_qgsserver.py
  155. +138 −129 tests/src/python/test_qgsserver_accesscontrol.py
  156. +1 −1 tests/src/python/test_qgsserver_wfst.py
  157. +6 −6 tests/src/python/test_qgssipcoverage.py
  158. +1 −1 tests/src/python/test_qgssymbol.py
  159. +16 −16 tests/src/python/test_qgssymbollayer.py
  160. +16 −16 tests/src/python/test_qgssymbollayer_createsld.py
  161. +15 −15 tests/src/python/test_qgstabwidget.py
  162. +16 −16 tests/src/python/test_qgsunittypes.py
  163. +10 −10 tests/src/python/test_qgsvectorfilewriter.py
  164. +9 −9 tests/src/python/test_qgsvectorlayer.py
  165. +3 −3 tests/src/python/test_qgsvirtuallayerdefinition.py
  166. +7 −7 tests/src/python/test_versioncompare.py
  167. +2 −2 tests/src/python/utilities.py
64 .travis.yml
View file
@@ -1,62 +1,6 @@
matrix:
fast_finish: true
allow_failures:
- os: osx
include:
# QT4 based build with Python 2.7 // using container based builds and prebuild binary dependencies in osgeo4travis
- os: linux
language: cpp
env:
- BUILD=qt4
- QT_VERSION=4
# - LLVM_VERSION=3.8
sudo: false
cache:
apt: true
directories:
- $HOME/.ccache
compiler: gcc
addons:
postgresql: "9.4"
apt:
sources:
# - llvm-toolchain-precise-3.8
- ubuntu-toolchain-r-test
- george-edison55-precise-backports # doxygen 1.8.3
packages:
- bison
- gcc-6
- g++-6
- doxygen
- flex
- flip
- libfcgi-dev
- libfftw3-3
- libpq-dev
- libqscintilla2-dev
- libqt4-dev
- libqt4-opengl-dev
- libqt4-sql-sqlite
- libqtwebkit-dev
- libqwt-dev
- libspatialindex-dev
- libspatialite-dev
- libsqlite3-dev
- pkg-config
- poppler-utils
- pyqt4-dev-tools
- python
- python-dev
- python-numpy
- python-pip
- python-psycopg2
- python-qscintilla2
- python-qt4-dev
- python-qt4-sql
- python-sip
- python-sip-dev
- txt2tags
- xvfb
# QT5 based build with Python 3 // using container based builds and prebuild binary dependencies in osgeo4travis
- os: linux
language: python # This lets us use newer python versions from virtualenv
@@ -93,10 +37,10 @@ matrix:
- flip
- clang-3.8
# OSX based build with QT4 and Python 2
- os: osx
env:
- BUILD=osx
- IGNORE_BUILD_FAILURES=YES
# - os: osx
# env:
# - BUILD=osx
# - IGNORE_BUILD_FAILURES=YES

git:
depth: 30
98 CMakeLists.txt
View file
@@ -246,47 +246,27 @@ ELSE (WITH_QTWEBKIT)
MESSAGE(STATUS "Qt WebKit support DISABLED.")
ENDIF(WITH_QTWEBKIT)
#############################################################
# search for Qt4
SET(QT_MIN_VERSION 4.8.0)
SET (ENABLE_QT5 FALSE CACHE BOOL "If enabled will try to find Qt5 before looking for Qt4")
IF (ENABLE_QT5)
FIND_PACKAGE(Qt5Core QUIET)
FIND_PACKAGE(Qt5Gui REQUIRED)
FIND_PACKAGE(Qt5Widgets REQUIRED)
FIND_PACKAGE(Qt5Network REQUIRED)
FIND_PACKAGE(Qt5Xml REQUIRED)
FIND_PACKAGE(Qt5Svg REQUIRED)
FIND_PACKAGE(Qt5Concurrent REQUIRED)
FIND_PACKAGE(Qt5PrintSupport REQUIRED)
FIND_PACKAGE(Qt5Positioning)
IF (WITH_QTWEBKIT)
FIND_PACKAGE(Qt5WebKit REQUIRED)
FIND_PACKAGE(Qt5WebKitWidgets REQUIRED)
ENDIF(WITH_QTWEBKIT)
FIND_PACKAGE(Qt5Test REQUIRED)
FIND_PACKAGE(Qt5UiTools REQUIRED)
FIND_PACKAGE(Qt5Script REQUIRED)
FIND_PACKAGE(Qt5Sql REQUIRED)
SET(QT5_BUILD TRUE)
INCLUDE("cmake/modules/ECMQt4To5Porting.cmake")
MESSAGE(STATUS "Found Qt version: ${Qt5Core_VERSION_STRING}")
ELSE()
FIND_PACKAGE(Qt4 ${QT_MIN_VERSION} REQUIRED)
SET(QT_USE_QTXML 1)
SET(QT_USE_QTNETWORK 1)
SET(QT_USE_QTSVG 1)
SET(QT_USE_QTSQL 1)
IF (WITH_QTWEBKIT)
SET(QT_USE_QTWEBKIT 1)
ENDIF(WITH_QTWEBKIT)
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))
MESSAGE(SEND_ERROR "Some Qt4 modules haven't been found!")
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))

INCLUDE( ${QT_USE_FILE} )

MESSAGE(STATUS "Found Qt version: ${QTVERSION}")
ENDIF()
# search for Qt5
SET(QT_MIN_VERSION 5.2.0)
FIND_PACKAGE(Qt5Core QUIET)
FIND_PACKAGE(Qt5Gui REQUIRED)
FIND_PACKAGE(Qt5Widgets REQUIRED)
FIND_PACKAGE(Qt5Network REQUIRED)
FIND_PACKAGE(Qt5Xml REQUIRED)
FIND_PACKAGE(Qt5Svg REQUIRED)
FIND_PACKAGE(Qt5Concurrent REQUIRED)
FIND_PACKAGE(Qt5PrintSupport REQUIRED)
FIND_PACKAGE(Qt5Positioning)
IF (WITH_QTWEBKIT)
FIND_PACKAGE(Qt5WebKit REQUIRED)
FIND_PACKAGE(Qt5WebKitWidgets REQUIRED)
ENDIF(WITH_QTWEBKIT)
FIND_PACKAGE(Qt5Test REQUIRED)
FIND_PACKAGE(Qt5UiTools REQUIRED)
FIND_PACKAGE(Qt5Script REQUIRED)
FIND_PACKAGE(Qt5Sql REQUIRED)
INCLUDE("cmake/modules/ECMQt4To5Porting.cmake")
MESSAGE(STATUS "Found Qt version: ${Qt5Core_VERSION_STRING}")

IF (WITH_QTMOBILITY)
FIND_PACKAGE(QtMobility 1.1.0)
@@ -312,12 +292,6 @@ ENDIF (WITH_TOUCH)
# search for QScintilla2 (C++ lib)
FIND_PACKAGE(QScintilla REQUIRED)

# search for QJSON and decide whether to enable ArcGIS providers
FIND_PACKAGE (QJSON)
IF (QJSON_FOUND AND NOT ENABLE_QT5)
SET (WITH_ARCGIS TRUE)
ENDIF (QJSON_FOUND AND NOT ENABLE_QT5)

# Master password hash and authentication encryption
FIND_PACKAGE(QCA REQUIRED)
# Check for runtime dependency of qca-ossl plugin
@@ -690,7 +664,7 @@ IF (UNIX AND NOT APPLE)
SET (QGIS_MANUAL_DIR ${CMAKE_INSTALL_PREFIX}/${QGIS_MANUAL_SUBDIR})
ENDIF (UNIX AND NOT APPLE)

SET (DISABLE_DEPRECATED ${ENABLE_QT5} CACHE BOOL "If set to true, it will disable deprecated functionality to prepare for the next generation of QGIS")
SET (DISABLE_DEPRECATED FALSE CACHE BOOL "If set to true, it will disable deprecated functionality to prepare for the next generation of QGIS")
IF (DISABLE_DEPRECATED)
ADD_DEFINITIONS(-DQGIS_DISABLE_DEPRECATED)
ENDIF (DISABLE_DEPRECATED)
@@ -699,12 +673,7 @@ ENDIF (DISABLE_DEPRECATED)
#############################################################
# Python build dependency

SET (ENABLE_PYTHON3 ${ENABLE_QT5} CACHE BOOL "If enabled will try to find Python 3 before looking for Python 2")
IF(ENABLE_PYTHON3)
SET(PYTHON_VER 3 CACHE STRING "Python version")
ELSE(ENABLE_PYTHON3)
SET(PYTHON_VER 2.7 CACHE STRING "Python version")
ENDIF(ENABLE_PYTHON3)
SET(PYTHON_VER 3 CACHE STRING "Python version")

FIND_PACKAGE(PythonInterp ${PYTHON_VER} REQUIRED)

@@ -715,17 +684,10 @@ IF (WITH_BINDINGS)

FIND_PACKAGE(PythonLibrary REQUIRED)

# python support: check for interpreter, sip, pyqt4
IF(ENABLE_QT5)
FIND_PACKAGE(PyQt5 REQUIRED)
SET(PYQT_SIP_FLAGS ${PYQT5_SIP_FLAGS})
SET(PYQT_SIP_DIR ${PYQT5_SIP_DIR})
ELSE(ENABLE_QT5)
FIND_PACKAGE(PyQt4 REQUIRED)
# setup SIP variables
SET(PYQT_SIP_FLAGS ${PYQT4_SIP_FLAGS})
SET(PYQT_SIP_DIR ${PYQT4_SIP_DIR})
ENDIF(ENABLE_QT5)
# python support: check for interpreter, sip, pyqt5
FIND_PACKAGE(PyQt5 REQUIRED)
SET(PYQT_SIP_FLAGS ${PYQT5_SIP_FLAGS})
SET(PYQT_SIP_DIR ${PYQT5_SIP_DIR})
SEPARATE_ARGUMENTS(PYQT_SIP_FLAGS) # convert space separated values to a list

FIND_PACKAGE(SIP REQUIRED)
@@ -742,11 +704,7 @@ IF (WITH_BINDINGS)
ENDIF (NOT BINDINGS_GLOBAL_INSTALL)

IF (WITH_CUSTOM_WIDGETS)
IF(ENABLE_QT5)
SET(PYUIC_WIDGET_PLUGIN_DIRECTORY ${PYQT5_MOD_DIR}/uic/widget-plugins/)
ELSE(ENABLE_QT5)
SET(PYUIC_WIDGET_PLUGIN_DIRECTORY ${PYQT4_MOD_DIR}/uic/widget-plugins/)
ENDIF(ENABLE_QT5)
SET(PYUIC_WIDGET_PLUGIN_DIRECTORY ${PYQT5_MOD_DIR}/uic/widget-plugins/)
ENDIF (WITH_CUSTOM_WIDGETS)

ENDIF (WITH_BINDINGS)
2 ci/travis/linux/qt5/blacklist.txt
View file
@@ -3,8 +3,6 @@ PyQgsJSONUtils
PyQgsLocalServer
PyQgsPalLabelingServer
PyQgsServer
PyQgsServerAccessControl
PyQgsSipCoverage
qgis_composermapgridtest
qgis_composerutils
ProcessingGrass7AlgorithmsImageryTest
2 ci/travis/linux/qt5/install.sh
View file
@@ -51,8 +51,6 @@ cmake \
-DWITH_ASTYLE=ON \
-DWITH_SERVER=ON \
-DWITH_INTERNAL_YAML=OFF \
-DENABLE_QT5=ON \
-DENABLE_PYTHON3=ON \
-DDISABLE_DEPRECATED=ON \
-DPORT_PLUGINS=ON \
-DCXX_EXTRA_FLAGS="$CLANG_WARNINGS" \
6 cmake/FindPythonLibrary.cmake
View file
@@ -44,11 +44,7 @@ else(EXISTS "${PYTHON_INCLUDE_PATH}" AND EXISTS "${PYTHON_LIBRARY}" AND EXISTS "
endif("${PYTHON_CUSTOM_FRAMEWORK}" MATCHES "Python\\.framework")
endif(APPLE AND PYTHON_CUSTOM_FRAMEWORK)

IF (ENABLE_PYTHON3)
FIND_PACKAGE(PythonInterp 3)
ELSE (ENABLE_PYTHON3)
FIND_PACKAGE(PythonInterp 2.7)
ENDIF (ENABLE_PYTHON3)
FIND_PACKAGE(PythonInterp 3)

if(PYTHONINTERP_FOUND)
FIND_FILE(_find_lib_python_py FindLibPython.py PATHS ${CMAKE_MODULE_PATH})
6 cmake/FindQCA.cmake
View file
@@ -20,11 +20,7 @@ if(QCA_INCLUDE_DIR AND QCA_LIBRARY)

else(QCA_INCLUDE_DIR AND QCA_LIBRARY)

if(ENABLE_QT5)
set(QCA_LIBRARY_NAMES qca-qt5 qca2-qt5)
else(ENABLE_QT5)
set(QCA_LIBRARY_NAMES qca qca2)
endif(ENABLE_QT5)
set(QCA_LIBRARY_NAMES qca-qt5 qca2-qt5)

find_library(QCA_LIBRARY
NAMES ${QCA_LIBRARY_NAMES}
6 cmake/FindQScintilla.cmake
View file
@@ -33,11 +33,7 @@ ELSE(EXISTS QSCINTILLA_VERSION_STR)
/usr/include
)

if(ENABLE_QT5)
set(QSCINTILLA_LIBRARY_NAMES qscintilla2-qt5 libqt5scintilla2 libqscintilla2-qt5 qt5scintilla2 libqscintilla2-qt5.dylib)
else(ENABLE_QT5)
set(QSCINTILLA_LIBRARY_NAMES qscintilla2 libqscintilla2 libqscintilla2.dylib)
endif(ENABLE_QT5)
set(QSCINTILLA_LIBRARY_NAMES qscintilla2-qt5 libqt5scintilla2 libqscintilla2-qt5 qt5scintilla2 libqscintilla2-qt5.dylib)

find_library(QSCINTILLA_LIBRARY
NAMES ${QSCINTILLA_LIBRARY_NAMES}
21 cmake/FindQsci.cmake
View file
@@ -23,11 +23,7 @@ ELSE(EXISTS QSCI_MOD_VERSION_STR)

FIND_FILE(_find_qsci_py FindQsci.py PATHS ${CMAKE_MODULE_PATH})

IF(ENABLE_QT5)
SET(QSCI_VER 5)
ELSE(ENABLE_QT5)
SET(QSCI_VER 4)
ENDIF(ENABLE_QT5)
SET(QSCI_VER 5)

EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} ${_find_qsci_py} ${QSCI_VER} OUTPUT_VARIABLE qsci_ver)

@@ -37,17 +33,10 @@ ELSE(EXISTS QSCI_MOD_VERSION_STR)
ENDIF(qsci_ver)

IF(QSCI_FOUND)
IF(ENABLE_QT5)
FIND_PATH(QSCI_SIP_DIR
NAMES Qsci/qscimod5.sip
PATHS ${PYQT5_SIP_DIR}
)
ELSE(ENABLE_QT5)
FIND_PATH(QSCI_SIP_DIR
NAMES Qsci/qscimod4.sip
PATHS ${PYQT4_SIP_DIR}
)
ENDIF(ENABLE_QT5)
FIND_PATH(QSCI_SIP_DIR
NAMES Qsci/qscimod5.sip
PATHS ${PYQT5_SIP_DIR}
)

IF(NOT QSCI_FIND_QUIETLY)
MESSAGE(STATUS "Found QScintilla2 PyQt module: ${QSCI_MOD_VERSION_STR}")
6 cmake/FindQwt.cmake
View file
@@ -20,11 +20,7 @@ FIND_PATH(QWT_INCLUDE_DIR NAMES qwt.h PATHS
PATH_SUFFIXES qwt-qt4 qwt qwt5 qwt6
)

if(ENABLE_QT5)
set(QWT_LIBRARY_NAMES qwt-qt5 qwt6-qt5)
else(ENABLE_QT5)
set(QWT_LIBRARY_NAMES qwt qwt6 qwt5 qwt-qt4 qwt6-qt4 qwt5-qt4)
endif(ENABLE_QT5)
set(QWT_LIBRARY_NAMES qwt-qt5 qwt6-qt5)

find_library(QWT_LIBRARY
NAMES ${QWT_LIBRARY_NAMES}
12 cmake/PyQtMacros.cmake
View file
@@ -4,15 +4,9 @@
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.

IF(ENABLE_QT5)
SET(PYUIC_PROG_NAME pyuic5)
SET(PYUIC_PROG_NAMES pyuic5)
SET(PYRCC_PROG_NAME pyrcc5)
ELSE(ENABLE_QT5)
SET(PYUIC_PROG_NAME pyuic4)
SET(PYUIC_PROG_NAMES python2-pyuic4 pyuic4)
SET(PYRCC_PROG_NAME pyrcc4)
ENDIF(ENABLE_QT5)
SET(PYUIC_PROG_NAME pyuic5)
SET(PYUIC_PROG_NAMES pyuic5)
SET(PYRCC_PROG_NAME pyrcc5)

IF(NOT PYUIC_PROGRAM)
IF (MSVC)
2 cmake_templates/qgsconfig.h.in
View file
@@ -56,7 +56,5 @@

#cmakedefine ENABLE_MODELTEST

#cmakedefine WITH_ARCGIS

#endif

1 doc/api_break.dox
View file
@@ -190,6 +190,7 @@ Use QgsComposerAttributeTableV2 instead.</li>
<li>QgsCRSCache was removed. QgsCoordinateReferenceSystem now internally uses a cache for CRS creation,
so there is no longer a need for the separate cache class. Code which previously called QgsCRSCache::updateCRSCache()
should now call QgsCoordinateReferenceSystem::invalidateCache() and QgsCoordinateTransformCache::instance()->invalidateCrs( authid ).</li>
<li>QgsHttpTransaction. This class was outdated and code should be ported to native Qt or Python implementations.</li>
<li>QgsLabel and QgsLabelAttributes. Replaced by labeling based on PAL library, see QgsLabelingEngineV2.</li>
<li>QgsLegendModel was removed.
<li>QgsMapCanvasMap. It is an internal class used by map canvas.</li>
7 python/CMakeLists.txt
View file
@@ -121,10 +121,6 @@ INCLUDE_DIRECTORIES(
${CMAKE_BINARY_DIR} # qgsconfig.h, qgsversion.h
)

IF(NOT ENABLE_QT5)
SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} QT5_SUPPORT)
ENDIF(NOT ENABLE_QT5)

IF(NOT ANDROID)
SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} ANDROID)
ENDIF(NOT ANDROID)
@@ -146,9 +142,6 @@ IF(PYQT4_VERSION_NUM LESS 263680) # 0x040600
SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} PROXY_FACTORY)
ENDIF(PYQT4_VERSION_NUM LESS 263680)

IF(NOT PYQT4_VERSION_NUM LESS 263941 AND NOT ENABLE_QT5) # 0x040705
SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} QSETINT_CONVERSION)
ENDIF(NOT PYQT4_VERSION_NUM LESS 263941 AND NOT ENABLE_QT5)
#
IF(NOT PYQT4_VERSION_NUM LESS 264194) # 0x040802
SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} QSETTYPE_CONVERSION)
6 python/PyQt/CMakeLists.txt
View file
@@ -23,11 +23,7 @@ SET(PYQT_COMPAT_FILES
ADD_CUSTOM_TARGET(pyqtcompat ALL)
ADD_DEPENDENCIES(pyqtcompat pyutils)

IF(ENABLE_QT5)
SET(PYQT_PREFIX PyQt5)
ELSE(ENABLE_QT5)
SET(PYQT_PREFIX PyQt4)
ENDIF(ENABLE_QT5)
SET(PYQT_PREFIX PyQt5)

FOREACH(pyfile ${PYQT_COMPAT_FILES})
GET_FILENAME_COMPONENT(_dir ${pyfile} PATH)
Loading

0 comments on commit cbff8f4

Please sign in to comment.