diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2016-12-05 16:50:43 +0100 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2016-12-13 12:24:38 +0000 |
commit | 19a7d4a58ccde13b651b2b39cf847b6f0c66bec7 (patch) | |
tree | d6d73089fb20e71ba013d869265ee1c4830f9a65 /PySide2/QtQuick | |
parent | 1981097f683fbb80783f1ef4e6c872b56c19fd15 (diff) |
QQmlIncubationController fixes and new VolatileBool type
QQmlIncubationController has a method called incubateWhile which takes
a volatile bool pointer argument. Python does not support any kind of
volatile variables, and shiboken has no implementation for primitive
pointer types.
The fix consists in creating a new custom VolatileBool type for
Python (written in c++), which can store a c++ volatile bool, as well
as some workarounds in the typesystem to make sure the incubateWhile
method does proper conversion between VolatileBools and volatile
bools.
Change-Id: I4e567ad9ad364ab8a9147248915ccf310ce860ea
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'PySide2/QtQuick')
-rw-r--r-- | PySide2/QtQuick/CMakeLists.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/PySide2/QtQuick/CMakeLists.txt b/PySide2/QtQuick/CMakeLists.txt index 4d3df2669..852f80c61 100644 --- a/PySide2/QtQuick/CMakeLists.txt +++ b/PySide2/QtQuick/CMakeLists.txt @@ -26,6 +26,7 @@ make_path(QtQuick_typesystem_path ${QtCore_SOURCE_DIR} ${QtCore_BINARY_DIR} ${QtQuick_SOURCE_DIR}) set(QtQuick_include_dirs ${QtQuick_SOURCE_DIR} + ${QtQml_SOURCE_DIR} ${Qt5Core_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS} |