diff options
| author | Lincoln Ramsay <lincoln.ramsay@nokia.com> | 2011-10-06 14:04:57 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-06 07:35:40 +0200 |
| commit | 79a23c0a41806cea83ff6208152c4463eedc9295 (patch) | |
| tree | 3d91d4bdc018ab61be202258030392b1e77ce752 /configure | |
| parent | cd62bacc89db0906b85da8fb3b0501fb5c4a39a1 (diff) | |
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>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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" |