4 files changed, 8 insertions, 4 deletions
diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf
index b98d9bdf2d..143df704b1 100644
--- a/mkspecs/common/linux.conf
+++ b/mkspecs/common/linux.conf
@@ -10,6 +10,9 @@ QMAKE_CFLAGS_THREAD    += -D_REENTRANT
 QMAKE_CXXFLAGS_THREAD  += $$QMAKE_CFLAGS_THREAD
 QMAKE_LFLAGS_GCSECTIONS = -Wl,--gc-sections
 
+QMAKE_LFLAGS_REL_RPATH  = -Wl,-z,origin
+QMAKE_REL_RPATH_BASE    = $ORIGIN
+
 QMAKE_INCDIR            =
 QMAKE_LIBDIR            =
 QMAKE_INCDIR_X11        =
diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf
index d80b41c74b..ad3c638a6f 100644
--- a/mkspecs/common/mac.conf
+++ b/mkspecs/common/mac.conf
@@ -22,6 +22,9 @@ QMAKE_FIX_RPATH         = install_name_tool -id
 QMAKE_LFLAGS_RPATH      = -Wl,-rpath,
 QMAKE_LFLAGS_GCSECTIONS = -Wl,-dead_strip
 
+QMAKE_LFLAGS_REL_RPATH  =
+QMAKE_REL_RPATH_BASE    = @loader_path
+
 QMAKE_LIBS_DYNLOAD      =
 QMAKE_LIBS_OPENGL       = -framework OpenGL -framework AGL
 QMAKE_LIBS_THREAD       =
diff --git a/mkspecs/common/winrt_winphone/manifests/8.1/AppxManifest.xml.in b/mkspecs/common/winrt_winphone/manifests/8.1/AppxManifest.xml.in
index 91353c608b..b02b691f48 100644
--- a/mkspecs/common/winrt_winphone/manifests/8.1/AppxManifest.xml.in
+++ b/mkspecs/common/winrt_winphone/manifests/8.1/AppxManifest.xml.in
@@ -42,7 +42,6 @@
       </m2:VisualElements>
     </Application>
   </Applications>$${WINRT_MANIFEST.capabilities}
-  <Dependencies>$${WINRT_MANIFEST.dependencies}
-  </Dependencies>
+  $${WINRT_MANIFEST.dependencies}
 </Package>
 <!-- Generated by qmake using the $$[QMAKE_XSPEC] mkspec. -->
diff --git a/mkspecs/common/winrt_winphone/manifests/8.1_wp/AppxManifest.xml.in b/mkspecs/common/winrt_winphone/manifests/8.1_wp/AppxManifest.xml.in
index 19deb94675..235fe96794 100644
--- a/mkspecs/common/winrt_winphone/manifests/8.1_wp/AppxManifest.xml.in
+++ b/mkspecs/common/winrt_winphone/manifests/8.1_wp/AppxManifest.xml.in
@@ -43,7 +43,6 @@
       </m3:VisualElements>
     </Application>
   </Applications>$${WINRT_MANIFEST.capabilities}
-  <Dependencies>$${WINRT_MANIFEST.dependencies}
-  </Dependencies>
+  $${WINRT_MANIFEST.dependencies}
 </Package>
 <!-- Generated by qmake using the $$[QMAKE_XSPEC] mkspec. -->