diff options
Diffstat (limited to 'mkspecs/features/qt_module_fwdpri.prf')
-rw-r--r-- | mkspecs/features/qt_module_fwdpri.prf | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/mkspecs/features/qt_module_fwdpri.prf b/mkspecs/features/qt_module_fwdpri.prf index 04d2d7771f..d400d273f8 100644 --- a/mkspecs/features/qt_module_fwdpri.prf +++ b/mkspecs/features/qt_module_fwdpri.prf @@ -32,9 +32,12 @@ 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 + 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 rpaths += $$eval(QT.$${dep}.libs) @@ -55,6 +58,7 @@ } else { module_rpathlink_priv = } + pluginpath = $$unique(pluginpath) # Create a forwarding module .pri file MODULE_FWD_PRI_CONT = \ @@ -67,6 +71,7 @@ $$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) |