aboutsummaryrefslogtreecommitdiffstats
path: root/sources/pyside2/PySide2/QtX11Extras
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2017-11-08 14:37:35 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2017-11-11 10:33:09 +0000
commitf78cc32299aa34069c64ae8f48163ac4eda560d5 (patch)
tree7cd611c471a7eaebe20536544cb68b6df533f8b5 /sources/pyside2/PySide2/QtX11Extras
parent5db35b37ac2401697a6238f21979fa1e84f0ff77 (diff)
Clean up pyside2_global.h
Make it possible to prepend or append something to the global module header by providing a .pre/.post.h file. This removes the need to have global includes and defines in pyside2_global.h and reduces module dependencies. Change-Id: I517c5765212813732b5694dcfcc86d2492e71a57 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'sources/pyside2/PySide2/QtX11Extras')
-rw-r--r--sources/pyside2/PySide2/QtX11Extras/CMakeLists.txt3
-rw-r--r--sources/pyside2/PySide2/QtX11Extras/QtX11Extras_global.post.h.in1
2 files changed, 4 insertions, 0 deletions
diff --git a/sources/pyside2/PySide2/QtX11Extras/CMakeLists.txt b/sources/pyside2/PySide2/QtX11Extras/CMakeLists.txt
index f15f77375..4f0111905 100644
--- a/sources/pyside2/PySide2/QtX11Extras/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtX11Extras/CMakeLists.txt
@@ -6,6 +6,9 @@ ${QtX11Extras_GEN_DIR}/qx11info_wrapper.cpp
${QtX11Extras_GEN_DIR}/qtx11extras_module_wrapper.cpp
)
+configure_file("${QtX11Extras_SOURCE_DIR}/QtX11Extras_global.post.h.in"
+ "${QtX11Extras_BINARY_DIR}/QtX11Extras_global.post.h" @ONLY)
+
set(QtX11Extras_include_dirs ${QtX11Extras_SOURCE_DIR}
${QtX11Extras_BINARY_DIR}
${Qt5X11Extras_INCLUDE_DIRS}
diff --git a/sources/pyside2/PySide2/QtX11Extras/QtX11Extras_global.post.h.in b/sources/pyside2/PySide2/QtX11Extras/QtX11Extras_global.post.h.in
new file mode 100644
index 000000000..abdaf3d5f
--- /dev/null
+++ b/sources/pyside2/PySide2/QtX11Extras/QtX11Extras_global.post.h.in
@@ -0,0 +1 @@
+#include <QtX11Extras/QX11Info>