diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2018-03-05 14:03:05 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2018-03-06 12:02:42 +0000 |
| commit | f92869113a1421494e62a17c1ab3bd86cdff7e18 (patch) | |
| tree | 6472cc9963e78a6d3f6b42cec394979181283432 | |
| parent | 471b05f35a9c57d7fa910cf9f11c7f5fdfbf2a93 (diff) | |
Check for compatible Qt version when building PySide2
Shiboken uses C++11 constructs like qAsConst, which necessitates
the usage of a Qt version >= 5.7. Instead of showing weird compilation
errors when building against Qt 5.6, print a nice error message.
Change-Id: Iea4bd41dbe1d7d05e9b28bfa6654f68c6633cd74
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| -rw-r--r-- | setup.py | 7 | ||||
| -rw-r--r-- | sources/pyside2/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | sources/shiboken2/CMakeLists.txt | 2 |
3 files changed, 8 insertions, 3 deletions
@@ -411,7 +411,12 @@ def get_qt_version(): qt_version = qtinfo.version if not qt_version: - log.error("Failed to query the Qt version with qmake %s" % self.qtinfo.qmake_command) + log.error("Failed to query the Qt version with qmake {0}".format(self.qtinfo.qmake_command)) + sys.exit(1) + + if LooseVersion(qtinfo.version) < LooseVersion("5.7"): + m = "Incompatible Qt version detected: {0}. A Qt version >= 5.7 is required." + log.error(m.format(qt_version)) sys.exit(1) return qt_version diff --git a/sources/pyside2/CMakeLists.txt b/sources/pyside2/CMakeLists.txt index 4db611f0d..41c62c67a 100644 --- a/sources/pyside2/CMakeLists.txt +++ b/sources/pyside2/CMakeLists.txt @@ -96,7 +96,7 @@ message(STATUS "PYTHON_CONFIG_SUFFIX: ${PYTHON_CONFIG_SUFFIX}") message(STATUS "PYTHON_SHARED_LIBRARY_SUFFIX: ${PYTHON_SHARED_LIBRARY_SUFFIX}") find_package(Shiboken2 2.0.0 REQUIRED) -find_package(Qt5 5.6.0 REQUIRED COMPONENTS Core) +find_package(Qt5 5.7 REQUIRED COMPONENTS Core) add_definitions(${Qt5Core_DEFINITIONS}) find_file(GL_H "gl.h" PATH_SUFFIXES "GL") diff --git a/sources/shiboken2/CMakeLists.txt b/sources/shiboken2/CMakeLists.txt index ccabc72e3..d9e110d6d 100644 --- a/sources/shiboken2/CMakeLists.txt +++ b/sources/shiboken2/CMakeLists.txt @@ -7,7 +7,7 @@ cmake_policy(VERSION 3.1) set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules/ ${CMAKE_MODULE_PATH}) -find_package(Qt5 REQUIRED COMPONENTS Core Xml XmlPatterns) +find_package(Qt5 5.7 REQUIRED COMPONENTS Core Xml XmlPatterns) add_definitions(${Qt5Core_DEFINITIONS}) |