diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-11-06 15:50:34 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-11-06 15:50:38 +0100 |
commit | b197a0dbb9f317dd9061ac002b039c53ab662d4e (patch) | |
tree | 29f852df50f2b8db8ed8d495749717c66d11a7c6 /sources/pyside2/PySide2/QtTest | |
parent | 63ab34b618538b6ab1a186754031ed88d730dcd3 (diff) | |
parent | 06e4edac7133d322fe3398502396e1cd8afd8329 (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: Ib359480f79ee4c2348f1cf1e5bf5f423f39be474
Diffstat (limited to 'sources/pyside2/PySide2/QtTest')
-rw-r--r-- | sources/pyside2/PySide2/QtTest/CMakeLists.txt | 6 | ||||
-rw-r--r-- | sources/pyside2/PySide2/QtTest/typesystem_test.xml | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/sources/pyside2/PySide2/QtTest/CMakeLists.txt b/sources/pyside2/PySide2/QtTest/CMakeLists.txt index 118f803ea..5893de7ba 100644 --- a/sources/pyside2/PySide2/QtTest/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtTest/CMakeLists.txt @@ -7,10 +7,6 @@ ${QtTest_GEN_DIR}/qtest_wrapper.cpp ${QtTest_GEN_DIR}/qttest_module_wrapper.cpp ) -make_path(QtTest_typesystem_path ${QtCore_SOURCE_DIR} ${QtGui_SOURCE_DIR} ${QtWidgets_SOURCE_DIR} - ${QtCore_BINARY_DIR} ${QtGui_BINARY_DIR} ${QtWidgets_BINARY_DIR} - ${QtTest_SOURCE_DIR}) - set(QtTest_include_dirs ${QtTest_SOURCE_DIR} ${QtTest_BINARY_DIR} ${Qt5Core_INCLUDE_DIRS} @@ -38,6 +34,6 @@ create_pyside_module(QtTest QtTest_include_dirs QtTest_libraries QtTest_deps - QtTest_typesystem_path + QtTest_SOURCE_DIR QtTest_SRC "") diff --git a/sources/pyside2/PySide2/QtTest/typesystem_test.xml b/sources/pyside2/PySide2/QtTest/typesystem_test.xml index b30a6b5da..da26370a1 100644 --- a/sources/pyside2/PySide2/QtTest/typesystem_test.xml +++ b/sources/pyside2/PySide2/QtTest/typesystem_test.xml @@ -40,9 +40,9 @@ ****************************************************************************/ --> <typesystem package="PySide2.QtTest"> - <load-typesystem name="typesystem_core.xml" generate="no"/> - <load-typesystem name="typesystem_gui.xml" generate="no"/> - <load-typesystem name="typesystem_widgets.xml" generate="no"/> + <load-typesystem name="QtCore/typesystem_core.xml" generate="no"/> + <load-typesystem name="QtGui/typesystem_gui.xml" generate="no"/> + <load-typesystem name="QtWidgets/typesystem_widgets.xml" generate="no"/> <rejection class="QTest" function-name="qCompare<char>"/> <rejection class="QTest" function-name="qCompare<char*>"/> |