diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-11-07 14:43:09 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-13 16:05:50 +0100 |
| commit | c3637ce66b240e0ca39efc9e97b4605edd4ec7ef (patch) | |
| tree | 3e7e690dd9d00869e23cafa9ae06057e284cf51f /mkspecs/features/qt_module_fwdpri.prf | |
| parent | f3597af5adcd2275503e9e4bfb425549f9ab3ced (diff) | |
define the module rpath in the installed module pri file
the fallback path wouldn't account for a sysroot. as there is no clean
way to implement that, rather remove the fallback alltogether and make
the rpath a mandatory part of modules.
Change-Id: I6f2bd6e36889be2f61e17a579174380aa3c6622d
Reviewed-by: Romain Pokrzywka <romain.pokrzywka@gmail.com>
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 | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/mkspecs/features/qt_module_fwdpri.prf b/mkspecs/features/qt_module_fwdpri.prf index 4c3a4b433f..33ceff1cd5 100644 --- a/mkspecs/features/qt_module_fwdpri.prf +++ b/mkspecs/features/qt_module_fwdpri.prf @@ -2,8 +2,6 @@ load(qt_build_paths) - isEmpty(MODULE_INSTALL_LIBS): MODULE_INSTALL_LIBS = $$[QT_INSTALL_LIBS/raw] - MODULE_FWD_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules/qt_lib_$${MODULE}.pri # -rpath-link is used by the linker to find depedencies of dynamic @@ -58,7 +56,6 @@ "QT_MODULE_PLUGIN_BASE = $$MODULE_BASE_OUTDIR/plugins" \ $$module_rpathlink \ $$module_rpathlink_priv \ - "QT.$${MODULE}.rpath = $$MODULE_INSTALL_LIBS" \ "include($$MODULE_PRI)" write_file($$MODULE_FWD_PRI, MODULE_FWD_PRI_CONT)|error("Aborting.") touch($$MODULE_FWD_PRI, $$MODULE_PRI) |