summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorLincoln Ramsay <lincoln.ramsay@nokia.com>2011-10-04 13:28:44 +1000
committerQt by Nokia <qt-info@nokia.com>2011-10-07 02:41:07 +0200
commita7d80babb5e97bb94a99f801287ddf9df6b3d9e7 (patch)
treeda4916309c226df3535ebeb4ea836902e9b15d45 /configure
parent614b9efcf5a1d36994245fb1173ab010d16cd702 (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>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure2
1 files changed, 2 insertions, 0 deletions
diff --git a/configure b/configure
index b10019897e..5e6b289aaf 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