AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake: Set define for default QPA platform

Browse Source 
This is used to set the default QPA platform and without it
all Gui applications trigger an assert in QString:-/

This is way simpler than going through configure.json.

Change-Id: I2c053e95c0f7e99e97a0b2918d8e4ac13d3494fd
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Tobias Hunger 2019-03-26 14:01:53 +01:00
parent c4bdddf917
commit 5c05c46e92
3 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/CMakeLists.txt
View File

@ -230,6 +230,7 @@ add_qt_module(Gui
DEFINES
QT_NO_USING_NAMESPACE
QT_NO_FOREACH
QT_QPA_DEFAULT_PLATFORM_NAME="${QT_QPA_DEFAULT_PLATFORM}"
LIBRARIES
Qt::CorePrivate
ZLIB::ZLIB

2
src/gui/configure.cmake
View File

@ -930,5 +930,3 @@ qt_feature("whatsthis" PUBLIC
PURPOSE "Supports displaying \"What's this\" help."
)
qt_feature_definition("whatsthis" "QT_NO_WHATSTHIS" NEGATE VALUE "1")
qt_extra_definition("QT_QPA_DEFAULT_PLATFORM" "${QT_QPA_DEFAULT_PLATFORM}" PUBLIC)

3
util/cmake/configurejson2cmake.py
View File

@ -1008,9 +1008,6 @@ def processJson(dir, ctx, data):
cm_fh.write('qt_extra_definition("QT_VERSION_MINOR" ${PROJECT_VERSION_MINOR} PUBLIC)\n')
cm_fh.write('qt_extra_definition("QT_VERSION_PATCH" ${PROJECT_VERSION_PATCH} PUBLIC)\n')
if ctx.get('module') == 'gui':
cm_fh.write('\nqt_extra_definition("QT_QPA_DEFAULT_PLATFORM" "${QT_QPA_DEFAULT_PLATFORM}" PUBLIC)\n')
# do this late:
processSubconfigs(dir, ctx, data)