diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-09-20 12:53:33 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-29 22:21:32 +0100 |
| commit | c9266e7cb93cc9c265f0de69e3660ee7dc4492c6 (patch) | |
| tree | 999a062b0c9e066e468cc8aced6c7eb1b5c05e53 /mkspecs/features/qt_functions.prf | |
| parent | 7aa0adf130447214ff3a7bb8144d35b366e94d77 (diff) | |
redo QT_PLUGIN_PATH assembly for non-installed execution
it is a bad idea to extract plugin paths from library modules.
instead, just collect plugin paths from all known repositories.
Change-Id: I527325f20e9cf98ae974997530af1b2893537e5d
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'mkspecs/features/qt_functions.prf')
| -rw-r--r-- | mkspecs/features/qt_functions.prf | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index 1d24ed9c00..f8922e68ef 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -210,12 +210,10 @@ defineTest(qtAddToolEnv) { defineTest(qtAddTargetEnv) { deps = $$resolve_depends(QT, "QT.") !isEmpty(deps) { - plugin_paths = for(dep, deps) { deppath += $$shell_path($$eval(QT.$${dep}.libs)) for(rpath, QT.$${dep}.rpath_link): \ deppath += $$shell_path($$rpath) - plugin_paths += $$eval(QT.$${dep}.plugin_path) $$eval(QT.$${dep}.plugins) } equals(QMAKE_HOST.os, Windows): \ deppath.name = PATH @@ -227,12 +225,14 @@ defineTest(qtAddTargetEnv) { error("Operating system not supported.") deppath.value = $$unique(deppath) deppath.CONFIG = prepend - pluginpath.name = QT_PLUGIN_PATH + pluginpath.value = - plugin_paths = $$unique(plugin_paths) - for(ppath, plugin_paths): \ - exists($$ppath): \ - pluginpath.value += $$shell_path($$ppath) + for(qmod, QMAKEMODULES) { + qmod = $$section(qmod, /, 0, -3)/plugins + exists($$qmod): pluginpath.value += $$shell_path($$qmod) + } + pluginpath.name = QT_PLUGIN_PATH + QT_TOOL_ENV += deppath pluginpath } qtAddToolEnv($$1, $$QT_TOOL_ENV) |