Title: [121670] trunk/Tools
- Revision
- 121670
- Author
- [email protected]
- Date
- 2012-07-02 04:27:48 -0700 (Mon, 02 Jul 2012)
Log Message
[Qt] Simplify detection of non-installed module file
Has the additional advantage that we do not rely on additional information.
Patch by Oswald Buddenhagen <[email protected]> on 2012-06-29
Reviewed by Tor Arne Vestbø.
* qmake/qt_webkit.pri:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (121669 => 121670)
--- trunk/Tools/ChangeLog 2012-07-02 10:55:19 UTC (rev 121669)
+++ trunk/Tools/ChangeLog 2012-07-02 11:27:48 UTC (rev 121670)
@@ -1,3 +1,13 @@
+2012-06-29 Oswald Buddenhagen <[email protected]>
+
+ [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 <[email protected]>
[EFL] Add Gamepad support
Modified: trunk/Tools/qmake/qt_webkit.pri (121669 => 121670)
--- trunk/Tools/qmake/qt_webkit.pri 2012-07-02 10:55:19 UTC (rev 121669)
+++ trunk/Tools/qmake/qt_webkit.pri 2012-07-02 11:27:48 UTC (rev 121670)
@@ -29,9 +29,7 @@
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 @@
# party applications that set QMAKE_EXTRA_MODULE_FORWARDS.
QMAKE_LFLAGS *= "$${QMAKE_LFLAGS_RPATH}$${QT_MODULE_LIB_BASE}"
}
- unset(install_prefix)
- unset(module_prefix)
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
