diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-11-14 09:41:54 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-11-14 09:41:56 +0100 |
| commit | fafd92f428d51bdd56c90a73149c441773dd9155 (patch) | |
| tree | 9a4bbaa00dc8329059b935b147ef719c2cfc8e2d /sources/pyside2/PySide2/QtTest | |
| parent | b197a0dbb9f317dd9061ac002b039c53ab662d4e (diff) | |
| parent | d2deced6471f7314ca8d4e64531054047f7515dc (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I2862ef0eac798f1b471c9c1af27ed556d37cf1e5
Diffstat (limited to 'sources/pyside2/PySide2/QtTest')
| -rw-r--r-- | sources/pyside2/PySide2/QtTest/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | sources/pyside2/PySide2/QtTest/QtTest_global.post.h.in | 1 | ||||
| -rw-r--r-- | sources/pyside2/PySide2/QtTest/QtTest_global.pre.h.in | 5 |
3 files changed, 12 insertions, 0 deletions
diff --git a/sources/pyside2/PySide2/QtTest/CMakeLists.txt b/sources/pyside2/PySide2/QtTest/CMakeLists.txt index 5893de7ba..6d2630f10 100644 --- a/sources/pyside2/PySide2/QtTest/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtTest/CMakeLists.txt @@ -7,6 +7,12 @@ ${QtTest_GEN_DIR}/qtest_wrapper.cpp ${QtTest_GEN_DIR}/qttest_module_wrapper.cpp ) +configure_file("${QtTest_SOURCE_DIR}/QtTest_global.pre.h.in" + "${QtTest_BINARY_DIR}/QtTest_global.pre.h" @ONLY) + +configure_file("${QtTest_SOURCE_DIR}/QtTest_global.post.h.in" + "${QtTest_BINARY_DIR}/QtTest_global.post.h" @ONLY) + set(QtTest_include_dirs ${QtTest_SOURCE_DIR} ${QtTest_BINARY_DIR} ${Qt5Core_INCLUDE_DIRS} diff --git a/sources/pyside2/PySide2/QtTest/QtTest_global.post.h.in b/sources/pyside2/PySide2/QtTest/QtTest_global.post.h.in new file mode 100644 index 000000000..ccd18153c --- /dev/null +++ b/sources/pyside2/PySide2/QtTest/QtTest_global.post.h.in @@ -0,0 +1 @@ +#include "pysideqtesttouch.h" diff --git a/sources/pyside2/PySide2/QtTest/QtTest_global.pre.h.in b/sources/pyside2/PySide2/QtTest/QtTest_global.pre.h.in new file mode 100644 index 000000000..65daf1b84 --- /dev/null +++ b/sources/pyside2/PySide2/QtTest/QtTest_global.pre.h.in @@ -0,0 +1,5 @@ +// QT_WIDGETS_LIB changes code generation in pysideqtesttouch.h + +#if @Qt5Widgets_FOUND@ +# define QT_WIDGETS_LIB +#endif |