add .rpath only for dynamic unix builds
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>
Thu, 13 Dec 2012 11:31:02 +0000 (12:31 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Fri, 14 Dec 2012 15:26:35 +0000 (16:26 +0100)
rpath is meaningless for static libraries.
and windows has no concept of rpaths to start with.

Change-Id: Ia02bbdfbf7112e7082175c3051c0839ac0900f57
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
mkspecs/features/qt_module.prf

index ad8d9aa..be0ca0b 100644 (file)
@@ -40,6 +40,10 @@ MODULE_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules-inst/qt_lib_$${MODULE}.pri
 !build_pass {
 
     # Create a module .pri file
+    unix:!static: \
+        module_rpath = "QT.$${MODULE}.rpath = $$[QT_INSTALL_LIBS/raw]"
+    else: \
+        module_rpath =
     !isEmpty(QT_FOR_PRIVATE) {
         contains(QT_FOR_PRIVATE, .*-private$):error("QT_FOR_PRIVATE may not contain *-private.")
         module_privdep = "QT.$${MODULE}.private_depends = $$QT_FOR_PRIVATE"
@@ -74,7 +78,7 @@ MODULE_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules-inst/qt_lib_$${MODULE}.pri
         "QT.$${MODULE}.sources = $$val_escape(_PRO_FILE_PWD_)" \
         "QT.$${MODULE}.libs = \$\$QT_MODULE_LIB_BASE" \
         "QT.$${MODULE}.libexecs = \$\$QT_MODULE_LIBEXEC_BASE" \
-        "QT.$${MODULE}.rpath = $$[QT_INSTALL_LIBS/raw]" \
+        $$module_rpath \
         "QT.$${MODULE}.plugins = \$\$QT_MODULE_PLUGIN_BASE" \
         "QT.$${MODULE}.imports = \$\$QT_MODULE_IMPORT_BASE" \
         "QT.$${MODULE}.qml = \$\$QT_MODULE_QML_BASE" \