diff options
| author | Lincoln Ramsay <lincoln.ramsay@nokia.com> | 2011-10-04 13:28:44 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-07 02:41:07 +0200 |
| commit | a7d80babb5e97bb94a99f801287ddf9df6b3d9e7 (patch) | |
| tree | da4916309c226df3535ebeb4ea836902e9b15d45 | |
| parent | 614b9efcf5a1d36994245fb1173ab010d16cd702 (diff) | |
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 <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| -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\".", |