From: Lincoln Ramsay <lincoln.ramsay@nokia.com>
Date: Thu, 6 Oct 2011 04:04:57 +0000 (+1000)
Subject: Logic does not match error message.
X-Git-Tag: qt-v5.0.0-alpha1~3327
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=79a23c0a41806cea83ff6208152c4463eedc9295;p=profile%2Fivi%2Fqtbase.git

Logic does not match error message.

Passing -no-xcb or -no-wayland was enough to get a build with neither
but the error message says you need to pass both. Fix the logic.

Change-Id: I2d554d371b603e7df7bc07e1b4d5271ba31243f0
Reviewed-on: http://codereview.qt-project.org/6099
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
---

diff --git a/configure b/configure
index 2bb15c3..b100198 100755
--- a/configure
+++ b/configure
@@ -6347,7 +6347,7 @@ if [ "$PLATFORM_QPA" = "yes" ]; then
 
     if [ "$PLATFORM_QPA" = "yes" ] && [ "$BUILD_ON_MAC" = "no" ]; then
         if [ "$CFG_XCB" = "no" ] && [ "$CFG_WAYLAND" = "no" ]; then
-            if [ "$ORIG_CFG_XCB" = "auto" ] && [ "$ORIG_CFG_WAYLAND" = "auto" ]; then
+            if [ "$ORIG_CFG_XCB" = "auto" ] || [ "$ORIG_CFG_WAYLAND" = "auto" ]; then
                 echo "No QPA platform plugin enabled!"
                 echo " If you really want to build without a QPA platform plugin you must pass"
                 echo " -no-xcb and -no-wayland to configure. Doing this will produce a Qt that"