diff options
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qguiapplication.cpp | 6 |
2 files changed, 7 insertions, 1 deletions
@@ -6273,6 +6273,7 @@ if [ "$PLATFORM_QPA" = "yes" ]; then exit 1 else CFG_WAYLAND=no + QMakeVar add DEFINES QT_NO_WAYLAND fi fi @@ -6304,6 +6305,7 @@ if [ "$PLATFORM_QPA" = "yes" ]; then exit 1 fi CFG_XCB=no + QMakeVar add DEFINES QT_NO_XCB fi fi diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index ee923ba095..22443eed80 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -238,8 +238,12 @@ static void init_platform(const QString &pluginArgument, const QString &platform const QString defaultPlatform = QLatin1String("cocoa"); #elif defined (Q_OS_WIN) const QString defaultPlatform = QLatin1String("windows"); -#else +#elif !defined (QT_NO_XCB) const QString defaultPlatform = QLatin1String("xcb"); +#elif !defined (QT_NO_WAYLAND) + const QString defaultPlatform = QLatin1String("wayland"); +#else + const QString defaultPlatform = QLatin1String("minimal"); #endif if (keys.contains(defaultPlatform)) { qWarning("No platform plugin argument was specified, defaulting to \"%s\".", |