diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-05-28 08:37:12 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-05-28 11:15:02 +0200 |
| commit | 50f21331028278a2dc02b667e3b6e88f60aeacec (patch) | |
| tree | 8a741fc28dd3313dfdb08656c24b759c4698f4e5 | |
| parent | 0f973f90b19d83a1c4df15271d745184ae1cf247 (diff) | |
CMake: Rename the ENABLE_ platform variables
Remove ENABLE_X11 in favor of ENABLE_UNIX to match the Q_OS_
defines.
Remove unused ENABLE_SIMULATOR.
Task-number: PYSIDE-802
Task-number: PYSIDE-1568
Pick-to: 6.1
Change-Id: I231580d562c4ee06db1bd6bf04eb53283d882134
Reviewed-by: Christian Tismer <tismer@stackless.com>
| -rw-r--r-- | sources/cmake_helpers/helpers.cmake | 5 | ||||
| -rw-r--r-- | sources/pyside6/PySide6/global.h.in | 14 |
2 files changed, 10 insertions, 9 deletions
diff --git a/sources/cmake_helpers/helpers.cmake b/sources/cmake_helpers/helpers.cmake index 2af3c75ab..b7c498637 100644 --- a/sources/cmake_helpers/helpers.cmake +++ b/sources/cmake_helpers/helpers.cmake @@ -58,19 +58,18 @@ endif() endmacro() macro(check_os) -set(ENABLE_X11 "0") +set(ENABLE_UNIX "1") set(ENABLE_MAC "0") set(ENABLE_WIN "0") -set(ENABLE_SIMULATOR "0") if(CMAKE_HOST_APPLE) set(ENABLE_MAC "1") set(AUTO_OS "mac") elseif(CMAKE_HOST_WIN32) set(ENABLE_WIN "1") + set(ENABLE_UNIX "0") set(AUTO_OS "win") elseif(CMAKE_HOST_UNIX) - set(ENABLE_X11 "1") set(AUTO_OS "x11") else() message(FATAL_ERROR "OS not supported") diff --git a/sources/pyside6/PySide6/global.h.in b/sources/pyside6/PySide6/global.h.in index 69f6f6b1e..519585fd7 100644 --- a/sources/pyside6/PySide6/global.h.in +++ b/sources/pyside6/PySide6/global.h.in @@ -39,12 +39,14 @@ #include <QtCore/qnamespace.h> -#if @ENABLE_X11@ - #define Q_OS_X11 -#elif @ENABLE_MAC@ - #define Q_OS_MAC -#elif @ENABLE_WIN@ - #define Q_OS_WIN +#if @ENABLE_MAC@ +# define Q_OS_MAC +#endif +#if @ENABLE_WIN@ +# define Q_OS_WIN +#endif +#if @ENABLE_UNIX@ +# define Q_OS_UNIX #endif // There are symbols in Qt that exist in Debug but |