diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-09-27 08:39:02 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-09-27 08:23:31 +0000 |
| commit | c9dc377e79f93c078b622f61814a4c264a948852 (patch) | |
| tree | ffc13d0c8cc15fa3b25291facf38e6d8828d0a07 /sources/pyside2/libpyside/CMakeLists.txt | |
| parent | 2412e332a9984891aa481176141d403183ac3b11 (diff) | |
libpyside: Replace configuration of signalmanager.cpp by defines
This makes the development process easier.
Task-number: PYSIDE-784
Change-Id: I07ced4b25b65c90e5a17d85be9b8f15a26e5d07d
Reviewed-by: Christian Tismer <tismer@stackless.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'sources/pyside2/libpyside/CMakeLists.txt')
| -rw-r--r-- | sources/pyside2/libpyside/CMakeLists.txt | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sources/pyside2/libpyside/CMakeLists.txt b/sources/pyside2/libpyside/CMakeLists.txt index 3069b1ca2..083a20725 100644 --- a/sources/pyside2/libpyside/CMakeLists.txt +++ b/sources/pyside2/libpyside/CMakeLists.txt @@ -17,6 +17,7 @@ if(${Qt5Quick_FOUND}) endif() endif() +set(QML_PRIVATE_API_SUPPORT 0) if(Qt5Qml_FOUND) # Used for registering custom QQuickItem classes defined in Python code. set(QML_SUPPORT 1) @@ -28,7 +29,6 @@ if(Qt5Qml_FOUND) set(QML_PRIVATE_API_SUPPORT 1) set(QML_INCLUDES ${QML_INCLUDES} ${Qt5Qml_PRIVATE_INCLUDE_DIRS}) else() - set(QML_PRIVATE_API_SUPPORT 0) message(WARNING "QML private API include files could not be found, support for catching QML exceptions inside Python code will not work.") endif() else() @@ -40,13 +40,10 @@ endif() qt5_wrap_cpp(DESTROYLISTENER_MOC "destroylistener.h") -configure_file("${CMAKE_CURRENT_SOURCE_DIR}/signalmanager.cpp.in" - "${CMAKE_CURRENT_BINARY_DIR}/signalmanager.cpp" @ONLY) - set(libpyside_SRC dynamicqmetaobject.cpp destroylistener.cpp - ${CMAKE_CURRENT_BINARY_DIR}/signalmanager.cpp + signalmanager.cpp globalreceiver.cpp globalreceiverv2.cpp pysideclassinfo.cpp @@ -107,6 +104,7 @@ endif() if(QML_SUPPORT) target_compile_definitions(pyside2 PUBLIC PYSIDE_QML_SUPPORT=1) endif() +target_compile_definitions(pyside2 PRIVATE PYSIDE_QML_PRIVATE_API_SUPPORT=${QML_PRIVATE_API_SUPPORT}) if(PYSIDE_QT_CONF_PREFIX) set_property(SOURCE pyside.cpp |