diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2017-11-07 16:14:11 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2017-11-15 15:47:09 +0000 |
| commit | e455d995be989cbdfef2bcd54fd7057a9b036b52 (patch) | |
| tree | 38a2865cb44350696d60fd15cd5b46a9278d17d9 /sources/pyside2/libpyside/CMakeLists.txt | |
| parent | 49fb9494ba6589cacda3c9e76fc354650a9fd87e (diff) | |
Make standalone installations relocatable
This is achieved by registering a qt.conf file with a Prefix pointing
to a directory relative to the loaded PySide2 module (e.g. QtCore).
Thus Qt does not crash due to not finding platform plugins.
Because this change would affect tests, which are ran before the
PySide package is installed, a new environment variable called
PYSIDE_DISABLE_INTERNAL_QT_CONF is introduced. This variable disables
the registration of the internal qt.conf file, thus it will not point
to a not yet created location, which will allow tests to run as
before.
Change-Id: I5a96037adfafe1f08ea57535aa4a2a0d1660dfaf
Task-number: PYSIDE-558
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'sources/pyside2/libpyside/CMakeLists.txt')
| -rw-r--r-- | sources/pyside2/libpyside/CMakeLists.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sources/pyside2/libpyside/CMakeLists.txt b/sources/pyside2/libpyside/CMakeLists.txt index 1cddebc07..de29269a4 100644 --- a/sources/pyside2/libpyside/CMakeLists.txt +++ b/sources/pyside2/libpyside/CMakeLists.txt @@ -111,6 +111,13 @@ if(QML_SUPPORT) target_compile_definitions(pyside2 PUBLIC PYSIDE_QML_SUPPORT=1) endif() +if(PYSIDE_QT_CONF_PREFIX) + set_property(SOURCE pyside.cpp + APPEND + PROPERTY COMPILE_DEFINITIONS + PYSIDE_QT_CONF_PREFIX=${PYSIDE_QT_CONF_PREFIX}) +endif() + # # install stuff # |