diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-06-23 14:36:03 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-06-23 14:36:07 +0200 |
commit | cdf8c68066e79e25c17eb725e4a471b0b83df544 (patch) | |
tree | 9a8ddcad64190d88102d73e8a62f9c201209a4f6 | |
parent | 09b06dd125323609af50de3afbfd5a4352521543 (diff) | |
parent | eefadcef3733bfcf370f67d844dd890fdaeb17a4 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.9
Change-Id: Ieeaa4659753416315a619d0b683a3e5a4c8ed54e
-rw-r--r-- | sources/pyside2/CMakeLists.txt | 3 | ||||
-rw-r--r-- | sources/pyside2/PySide2/QtMacExtras/CMakeLists.txt | 2 | ||||
-rw-r--r-- | sources/pyside2/PySide2/QtNetwork/CMakeLists.txt | 2 | ||||
-rw-r--r-- | sources/pyside2/PySide2/QtWidgets/CMakeLists.txt | 17 | ||||
-rw-r--r-- | sources/pyside2/cmake/Macros/PySideModules.cmake | 7 | ||||
-rw-r--r-- | sources/pyside2/tests/pysidetest/CMakeLists.txt | 5 | ||||
-rw-r--r-- | testrunner.py | 10 |
7 files changed, 24 insertions, 22 deletions
diff --git a/sources/pyside2/CMakeLists.txt b/sources/pyside2/CMakeLists.txt index 8465e7d42..4888b8ea8 100644 --- a/sources/pyside2/CMakeLists.txt +++ b/sources/pyside2/CMakeLists.txt @@ -3,6 +3,9 @@ include(cmake/Macros/icecc.cmake) # this must be the first line! cmake_minimum_required(VERSION 3.0) cmake_policy(VERSION 3.0) +# Don't ignore targets that do not exist, inside add_dependencies calls. +cmake_policy(SET CMP0046 NEW) + project(pysidebindings) set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Macros/ diff --git a/sources/pyside2/PySide2/QtMacExtras/CMakeLists.txt b/sources/pyside2/PySide2/QtMacExtras/CMakeLists.txt index a98f18e69..b23b20c5f 100644 --- a/sources/pyside2/PySide2/QtMacExtras/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtMacExtras/CMakeLists.txt @@ -6,7 +6,7 @@ ${QtMacExtras_GEN_DIR}/qmactoolbar_wrapper.cpp ${QtMacExtras_GEN_DIR}/qmactoolbaritem_wrapper.cpp # module is always needed -${QtMacExtras_GEN_DIR}/QtMacExtras_module_wrapper.cpp +${QtMacExtras_GEN_DIR}/qtmacextras_module_wrapper.cpp ) make_path(QtMacExtras_typesystem_path ${QtMacExtras_SOURCE_DIR} diff --git a/sources/pyside2/PySide2/QtNetwork/CMakeLists.txt b/sources/pyside2/PySide2/QtNetwork/CMakeLists.txt index 26518991d..f01aaf77a 100644 --- a/sources/pyside2/PySide2/QtNetwork/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtNetwork/CMakeLists.txt @@ -2,6 +2,7 @@ project(QtNetwork) set(QtNetwork_OPTIONAL_SRC ) set(QtNetwork_DROPPED_ENTRIES ) + check_qt_class(QtNetwork QSslCertificate QtNetwork_OPTIONAL_SRC QtNetwork_DROPPED_ENTRIES) check_qt_class(QtNetwork QSslCipher QtNetwork_OPTIONAL_SRC QtNetwork_DROPPED_ENTRIES) check_qt_class(QtNetwork QSslConfiguration QtNetwork_OPTIONAL_SRC QtNetwork_DROPPED_ENTRIES) @@ -37,6 +38,7 @@ ${QtNetwork_GEN_DIR}/qssl_wrapper.cpp ${QtNetwork_GEN_DIR}/qtcpserver_wrapper.cpp ${QtNetwork_GEN_DIR}/qtcpsocket_wrapper.cpp ${QtNetwork_GEN_DIR}/qudpsocket_wrapper.cpp +${QtNetwork_OPTIONAL_SRC} # module is always needed ${QtNetwork_GEN_DIR}/qtnetwork_module_wrapper.cpp ) diff --git a/sources/pyside2/PySide2/QtWidgets/CMakeLists.txt b/sources/pyside2/PySide2/QtWidgets/CMakeLists.txt index 84dec8fa9..e401db47c 100644 --- a/sources/pyside2/PySide2/QtWidgets/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtWidgets/CMakeLists.txt @@ -3,22 +3,9 @@ project(QtWidgets) set(QtWidgets_OPTIONAL_SRC ) set(QtWidgets_DROPPED_ENTRIES ) -## gone check_qt_class(Qt5Widgets QAbstractPageSetupDialog QtWidgets_OPTIONAL_SRC QtWidgets_DROPPED_ENTRIES) -## actually, all the printer stuff is in QtPrintSupport ## XXX check if these conditionals need to be done elsewhere -check_qt_class(Qt5Widgets QAbstractPrintDialog QtWidgets_OPTIONAL_SRC QtWidgets_DROPPED_ENTRIES) -check_qt_class(Qt5Widgets QGtkStyle QtWidgets_OPTIONAL_SRC QtWidgets_DROPPED_ENTRIES) -check_qt_class(Qt5Widgets QPageSetupDialog QtWidgets_OPTIONAL_SRC QtWidgets_DROPPED_ENTRIES) -check_qt_class(Qt5Widgets QPrintDialog QtWidgets_OPTIONAL_SRC QtWidgets_DROPPED_ENTRIES) -check_qt_class(Qt5Widgets QPrintEngine QtWidgets_OPTIONAL_SRC QtWidgets_DROPPED_ENTRIES) -check_qt_class(Qt5Widgets QPrintPreviewDialog QtWidgets_OPTIONAL_SRC QtWidgets_DROPPED_ENTRIES) -check_qt_class(Qt5Widgets QPrintPreviewWidget QtWidgets_OPTIONAL_SRC QtWidgets_DROPPED_ENTRIES) -check_qt_class(Qt5Widgets QPrinter QtWidgets_OPTIONAL_SRC QtWidgets_DROPPED_ENTRIES) -check_qt_class(Qt5Widgets QPrinterInfo QtWidgets_OPTIONAL_SRC QtWidgets_DROPPED_ENTRIES) -check_qt_class(Qt5Widgets QSessionManager QtWidgets_OPTIONAL_SRC QtWidgets_DROPPED_ENTRIES) -check_qt_class(Qt5Widgets QSizeGrip QtWidgets_OPTIONAL_SRC QtWidgets_DROPPED_ENTRIES) -check_qt_class(Qt5Widgets QSystemTrayIcon QtWidgets_OPTIONAL_SRC QtWidgets_DROPPED_ENTRIES) -check_qt_class(Qt5Widgets QMacStyle QtWidgets_OPTIONAL_SRC QtWidgets_DROPPED_ENTRIES) +check_qt_class(QtWidgets QGtkStyle QtWidgets_OPTIONAL_SRC QtWidgets_DROPPED_ENTRIES) +check_qt_class(QtWidgets QMacStyle QtWidgets_OPTIONAL_SRC QtWidgets_DROPPED_ENTRIES) set(QtWidgets_SRC ${QtWidgets_GEN_DIR}/qabstractbutton_wrapper.cpp diff --git a/sources/pyside2/cmake/Macros/PySideModules.cmake b/sources/pyside2/cmake/Macros/PySideModules.cmake index e2a1bdcdb..f5c2483c3 100644 --- a/sources/pyside2/cmake/Macros/PySideModules.cmake +++ b/sources/pyside2/cmake/Macros/PySideModules.cmake @@ -138,7 +138,8 @@ macro(check_qt_class module class optional_source_files dropped_entries) set (include_file ${class}) endif () string(TOLOWER ${class} _class) - string(TOUPPER ${module} _module) + # Remove the "Qt" prefix. + string(SUBSTRING ${module} 2 -1 _module_no_qt_prefix) if (_namespace) set(_cppfile ${CMAKE_CURRENT_BINARY_DIR}/PySide2/${module}/${_namespace}_${_class}_wrapper.cpp) else () @@ -165,9 +166,7 @@ macro(check_qt_class module class optional_source_files dropped_entries) try_compile(Q_WORKS ${CMAKE_BINARY_DIR} ${SRC_FILE} CMAKE_FLAGS - "-DLINK_LIBRARIES=${QT_${_module}_LIBRARY}" - "-DLINK_DIRECTORIES=${QT_LIBRARY_DIR}" - "-DINCLUDE_DIRECTORIES=${QT_INCLUDE_DIR};${QT_${_module}_INCLUDE_DIR}" + "-DINCLUDE_DIRECTORIES=${QT_INCLUDE_DIR};${Qt5${_module_no_qt_prefix}_INCLUDE_DIRS}" OUTPUT_VARIABLE OUTPUT) file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeCheckQtClassTest.log ${OUTPUT}) diff --git a/sources/pyside2/tests/pysidetest/CMakeLists.txt b/sources/pyside2/tests/pysidetest/CMakeLists.txt index 73644a057..bca2f5387 100644 --- a/sources/pyside2/tests/pysidetest/CMakeLists.txt +++ b/sources/pyside2/tests/pysidetest/CMakeLists.txt @@ -3,6 +3,9 @@ project(testbinding) cmake_minimum_required(VERSION 2.6) +# On Windows, don't link to qtmain.lib for executables automatically. +cmake_policy(SET CMP0020 OLD) + set(QT_USE_QTCORE 1) # no more supported: include(${QT_USE_FILE}) add_definitions(${Qt5Core_DEFINITIONS}) @@ -117,7 +120,7 @@ target_link_libraries(testbinding ${Qt5Widgets_LIBRARIES} ${SBK_PYTHON_LIBRARIES}) -add_dependencies(testbinding pyside2 QtCore QtGui QtWidgets libpyside pysidetest) +add_dependencies(testbinding pyside2 QtCore QtGui QtWidgets pysidetest) PYSIDE_TEST(decoratedslot_test.py) PYSIDE_TEST(delegatecreateseditor_test.py) diff --git a/testrunner.py b/testrunner.py index 096457e81..434b332a5 100644 --- a/testrunner.py +++ b/testrunner.py @@ -220,10 +220,18 @@ class TestRunner(object): self.teeCommand = winWhich('tee.exe') if self.teeCommand is None: git = winWhich('git.exe') + if not git: + # In COIN we have only git.cmd in path + git = winWhich('git.cmd') if 'cmd' in git: # Check for a MSYS-git installation with 'cmd' in the path and grab 'tee' from usr/bin index = git.index('cmd') - self.teeCommand = git[0:index] + 'usr\\bin\\tee.exe' + self.teeCommand = git[0:index] + 'bin\\tee.exe' + if not os.path.exists(self.teeCommand): + self.teeCommand = git[0:index] + 'usr\\bin\\tee.exe' # git V2.8.X + if not os.path.exists(self.teeCommand): + raise "Cannot locate 'tee' command" + else: self.makeCommand = 'make' self.teeCommand = 'tee' |