diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-08-06 18:45:38 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-08-06 18:45:46 +0200 |
commit | aa58ad6e8b1f44f7c05aaeb39dfb02d33469d97b (patch) | |
tree | 1d7bcde0f28a7243951b034ae2fdc9ba7d89e35f /sources/pyside2/PySide2/QtGui | |
parent | 26d6ef0c8f359b3bc29e2f68238e28f86e9448c5 (diff) | |
parent | 83b42ca06c834ad07985397764ebe2d7a58234ce (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I94feceebbf74afb6ad9b8f28303415df42b092bf
Diffstat (limited to 'sources/pyside2/PySide2/QtGui')
-rw-r--r-- | sources/pyside2/PySide2/QtGui/CMakeLists.txt | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/sources/pyside2/PySide2/QtGui/CMakeLists.txt b/sources/pyside2/PySide2/QtGui/CMakeLists.txt index bee58bde2..1fe743c01 100644 --- a/sources/pyside2/PySide2/QtGui/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtGui/CMakeLists.txt @@ -2,6 +2,12 @@ project(QtGui) qt5_wrap_cpp(QPYTEXTOBJECT_MOC "${pyside2_SOURCE_DIR}/qpytextobject.h") +set(QtGui_OPTIONAL_SRC) +set(QtGui_DROPPED_ENTRIES) + +check_qt_class(QtGui QOpenGLTimeMonitor QtGui_OPTIONAL_SRC QtGui_DROPPED_ENTRIES) +check_qt_class(QtGui QOpenGLTimerQuery QtGui_OPTIONAL_SRC QtGui_DROPPED_ENTRIES) + set(QtGui_SRC ${QtGui_GEN_DIR}/qabstractopenglfunctions_wrapper.cpp ${QtGui_GEN_DIR}/qabstracttextdocumentlayout_paintcontext_wrapper.cpp @@ -96,8 +102,6 @@ ${QtGui_GEN_DIR}/qopenglpixeltransferoptions_wrapper.cpp ${QtGui_GEN_DIR}/qopenglshaderprogram_wrapper.cpp ${QtGui_GEN_DIR}/qopengltexture_wrapper.cpp ${QtGui_GEN_DIR}/qopengltextureblitter_wrapper.cpp -${QtGui_GEN_DIR}/qopengltimemonitor_wrapper.cpp -${QtGui_GEN_DIR}/qopengltimerquery_wrapper.cpp ${QtGui_GEN_DIR}/qopenglversionprofile_wrapper.cpp ${QtGui_GEN_DIR}/qopenglvertexarrayobject_wrapper.cpp ${QtGui_GEN_DIR}/qopenglvertexarrayobject_binder_wrapper.cpp @@ -203,7 +207,7 @@ ${QtGui_GEN_DIR}/qwhatsthisclickedevent_wrapper.cpp ${QtGui_GEN_DIR}/qwheelevent_wrapper.cpp ${QtGui_GEN_DIR}/qwindow_wrapper.cpp ${QtGui_GEN_DIR}/qwindowstatechangeevent_wrapper.cpp - +${QtGui_OPTIONAL_SRC} # module is always needed ${QtGui_GEN_DIR}/qtgui_module_wrapper.cpp ) @@ -237,7 +241,10 @@ create_pyside_module(QtGui QtGui_SOURCE_DIR QtGui_SRC QPYTEXTOBJECT_MOC - ${QtGui_BINARY_DIR}/typesystem_gui.xml) + ${QtGui_BINARY_DIR}/typesystem_gui.xml + "" + "" + QtGui_DROPPED_ENTRIES) install(FILES ${pyside2_SOURCE_DIR}/qpytextobject.h DESTINATION include/PySide2/QtGui/) |