diff options
| author | Romain Pokrzywka <romain.pokrzywka@bluescape.com> | 2015-10-26 17:50:45 -0700 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-01-12 15:21:39 +0000 |
| commit | 650b4d0f49a533858327204f1b6a930a63c7986a (patch) | |
| tree | 72c60d1a1ace7d3646a6f0de0ae906715275a145 | |
| parent | d8cfa6a144e7c592c7b9d77f01bbcd3f57617b33 (diff) | |
Append the environment's QT_PLUGIN_PATH to 'make check' targets
Without this, any test executable requiring a plugin path from
the environment's QT_PLUGIN_PATH will fail to run since the path is
overwritten when generating the 'make check' command, for example:
QT_PLUGIN_PATH=/path/to/qt/plugins \
LD_LIBRARY_PATH=/path/to/qt/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} \
./test_foo
A prepend config option is used for *PATH to preserve the envvar
value, so use the same option for QT_PLUGIN_PATH. The command above
then becomes:
QT_PLUGIN_PATH=/path/to/qt/plugins${QT_PLUGIN_PATH:+:$QT_PLUGIN_PATH} \
LD_LIBRARY_PATH=/path/to/qt/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} \
./test_foo
Change-Id: I69b43327974915eae52f299fc4001effe93a491a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| -rw-r--r-- | mkspecs/features/qt_functions.prf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index c23d006d82..e239db2454 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -206,6 +206,7 @@ defineTest(qtAddTargetEnv) { pluginpath.value += $$system_path($$qplug) } pluginpath.name = QT_PLUGIN_PATH + pluginpath.CONFIG = prepend QT_TOOL_ENV += deppath pluginpath } |