From a7d80babb5e97bb94a99f801287ddf9df6b3d9e7 Mon Sep 17 00:00:00 2001 From: Lincoln Ramsay Date: Tue, 4 Oct 2011 13:28:44 +1000 Subject: [PATCH] Don't default to XCB if it is not enabled. Default to wayland unless it's not enabled. Default to minimal otherwise. Change-Id: I0fa523eae395821a7cb0cabbb27ca073e594246f Reviewed-on: http://codereview.qt-project.org/5945 Reviewed-by: Qt Sanity Bot Reviewed-by: Friedemann Kleint Reviewed-by: Oswald Buddenhagen --- configure | 2 ++ src/gui/kernel/qguiapplication.cpp | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/configure b/configure index b100198..5e6b289 100755 --- a/configure +++ b/configure @@ -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 ee923ba..22443ee 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\".", -- 2.7.4