diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-07-20 13:44:57 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-07-20 13:12:36 +0000 |
| commit | 6db97969571b5d1b51b22d2de29eb37f253689f0 (patch) | |
| tree | 0baf75b7bc10f55e2f6d6119a8c42550ce25cb72 /sources/pyside2/tests/pysidetest | |
| parent | 92d64508f04743ccc6ba320d11bd5d89b6ff57ed (diff) | |
Fix build after qtbase/054b66a65748c9ebfafeca88bf31669a24994237
Qt6Core_DEFINITIONS contains nonsensical values after the change:
${Qt6Core_DEFINITIONS} = -DQT_CORE_LIB;-D$<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG>
causing
ninja: error: build.ninja:6014: bad $-escape (literal $ must be written as $$)
Remove it from sources/pyside2/tests/pysidetest/CMakeLists.txt since
it appears to work without.
Task-number: PYSIDE-1339
Task-number: PYSIDE-904
Change-Id: I63e8e6d9215302b916f46808b80ac5ab749c0375
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'sources/pyside2/tests/pysidetest')
| -rw-r--r-- | sources/pyside2/tests/pysidetest/CMakeLists.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sources/pyside2/tests/pysidetest/CMakeLists.txt b/sources/pyside2/tests/pysidetest/CMakeLists.txt index cdf653745..b2eb7139b 100644 --- a/sources/pyside2/tests/pysidetest/CMakeLists.txt +++ b/sources/pyside2/tests/pysidetest/CMakeLists.txt @@ -5,7 +5,10 @@ cmake_minimum_required(VERSION 3.1) set(QT_USE_QTCORE 1) # no more supported: include(${QT_USE_FILE}) -add_definitions(${Qt${QT_MAJOR_VERSION}Core_DEFINITIONS}) + +# removed after qtbase/054b66a65748c9ebfafeca88bf31669a24994237, is this required? +# add_definitions(${Qt${QT_MAJOR_VERSION}Core_DEFINITIONS}) + add_definitions(-DQT_SHARED) add_definitions(-DRXX_ALLOCATOR_INIT_0) |