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_module_fwdpri.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_module_fwdpri.prf')
| -rw-r--r-- | mkspecs/features/qt_module_fwdpri.prf | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/mkspecs/features/qt_module_fwdpri.prf b/mkspecs/features/qt_module_fwdpri.prf index 5dc63ebdfd..9a0fd36019 100644 --- a/mkspecs/features/qt_module_fwdpri.prf +++ b/mkspecs/features/qt_module_fwdpri.prf @@ -32,11 +32,9 @@ privqt = $$replace(QT_PRIVATE, -private$, ) privdep = $$resolve_depends(privqt, "QT.") rpaths = - pluginpath = alldep = $$pubdep $$privdep for(dep, alldep) { # Inherit link-rpaths from all our dependencies rpaths += $$eval(QT.$${dep}.rpath_link) $$eval(QT.$${dep}.rpath_link_private) - pluginpath += $$eval(QT.$${dep}.plugin_path) $$eval(QT.$${dep}.plugins) } privdep -= $$pubdep for(dep, privdep): \ # Add our private dependencies' lib paths as new link-rpaths @@ -58,7 +56,6 @@ } else { module_rpathlink_priv = } - pluginpath = $$unique(pluginpath) # Create a forwarding module .pri file MODULE_FWD_PRI_CONT = \ @@ -71,7 +68,6 @@ $$module_rpathlink \ $$module_rpathlink_priv \ "QT.$${MODULE}.rpath = $$MODULE_INSTALL_LIBS" \ - "QT.$${MODULE}.plugin_path = $$val_escape(pluginpath)" \ "include($$MODULE_PRI)" write_file($$MODULE_FWD_PRI, MODULE_FWD_PRI_CONT)|error("Aborting.") touch($$MODULE_FWD_PRI, $$MODULE_PRI) |