diff options
| author | Andy Nichols <andy.nichols@nokia.com> | 2011-09-07 13:56:08 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2011-09-07 14:04:02 +0200 |
| commit | a796eda7c4267f19f30db6c2c787d0f65b340013 (patch) | |
| tree | 29e0d90186849f1066c3c8bf4df9501324a566dc /config.tests/qpa | |
| parent | bb18b98e9547b5187047ff8c30f707818e2936f0 (diff) | |
Fix for wayland config.test
Wayland config.test would only be able to build if there was a valid
value for QMAKE_LIBDIR_WAYLAND because if this was empty, -L would be
used, which would lead to invalid command syntax. So even if the
library was already in the build path, the test would fail. The test
now checks QMAKE_LIBDIR_WAYLAND for valid directoires first before add
them to the LIBS variable.
Change-Id: Ic3a3be54a41390d6302a122a6d20f896e962ccc7
Reviewed-on: http://codereview.qt.nokia.com/4354
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
Diffstat (limited to 'config.tests/qpa')
| -rw-r--r-- | config.tests/qpa/wayland/wayland.pro | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/config.tests/qpa/wayland/wayland.pro b/config.tests/qpa/wayland/wayland.pro index dbbd196975..6d85073b91 100644 --- a/config.tests/qpa/wayland/wayland.pro +++ b/config.tests/qpa/wayland/wayland.pro @@ -1,4 +1,12 @@ SOURCES = wayland.cpp CONFIG -= qt -INCLUDEPATH += $$QMAKE_INCDIR_WAYLAND -LIBS += $$QMAKE_LIBS_WAYLAND -L$$QMAKE_LIBDIR_WAYLAND + +for(d, QMAKE_INCDIR_WAYLAND) { + exists($$d):INCLUDEPATH += $$d +} + +for(p, QMAKE_LIBDIR_WAYLAND) { + exists($$p):LIBS += -L$$p +} + +LIBS += $$QMAKE_LIBS_WAYLAND |