[Qt] Simplify detection of non-installed module file

Has the additional advantage that we do not rely on additional information.

Patch by Oswald Buddenhagen <oswald.buddenhagen@nokia.com> on 2012-06-29
Reviewed by Tor Arne Vestbø.

* qmake/qt_webkit.pri:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@121670 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index e2a3c72..ad46cf3 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,13 @@
+2012-06-29  Oswald Buddenhagen  <oswald.buddenhagen@nokia.com>
+
+        [Qt] Simplify detection of non-installed module file
+
+        Has the additional advantage that we do not rely on additional information.
+
+        Reviewed by Tor Arne Vestbø.
+
+        * qmake/qt_webkit.pri:
+
 2012-07-01  Christophe Dumez  <christophe.dumez@intel.com>
 
         [EFL] Add Gamepad support

diff --git a/Tools/qmake/qt_webkit.pri b/Tools/qmake/qt_webkit.pri
index 5ec50ab..11dcc65 100644 (file)
--- a/Tools/qmake/qt_webkit.pri
+++ b/Tools/qmake/qt_webkit.pri
@@ -29,9 +29,7 @@ QT_WEBKIT_MINOR_VERSION = $$QT.webkit.MINOR_VERSION
 QT_WEBKIT_PATCH_VERSION = $$QT.webkit.PATCH_VERSION
 
 unix:!mac {
-    install_prefix = $$find(_FILE_, ^$$[QT_INSTALL_PREFIX])
-    module_prefix = $$find(QMAKE_EXTRA_MODULE_FORWARDS, ^$$dirname(QT_MODULE_BIN_BASE))
-    isEmpty(install_prefix):!isEmpty(module_prefix) {
+    !isEmpty(QT_MODULE_LIB_BASE):!equals(QT_MODULE_LIB_BASE, $$[QT_INSTALL_LIBS]) {
         # We are loading the qt_webkit.pri forwarding file from the
         # local webkit build directory, so set up rpath to point to
         # to the local build. This ensures that any of the WebKit tools
@@ -40,6 +38,4 @@ unix:!mac {
         # party applications that set QMAKE_EXTRA_MODULE_FORWARDS.
         QMAKE_LFLAGS *= "$${QMAKE_LFLAGS_RPATH}$${QT_MODULE_LIB_BASE}"
     }
-    unset(install_prefix)
-    unset(module_prefix)
 }