Changeset 121961 in webkit

Timestamp:

Jul 6, 2012 6:14:20 AM (12 years ago)

Author:

Csaba Osztrogonác

Message:

[Qt] Don't let qt_webkit.pri proclaim its own location

This won't work any more with recent Qt5 versions, as the forwarding
pri is created by qt_module_config, which needs MODULE_PRI to be set
up already.

We also need to load build_config, not qt_module.

​https://bugs.webkit.org/show_bug.cgi?id=90461

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

.:

• Source/api.pri:

Tools:

• qmake/qt_webkit.pri:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/api.pri (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/qmake/qt_webkit.pri (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2012-07-06  Oswald Buddenhagen  <oswald.buddenhagen@nokia.com>
+
+        [Qt] Don't let qt_webkit.pri proclaim its own location
+
+        This won't work any more with recent Qt5 versions, as the forwarding
+        pri is created by qt_module_config, which needs MODULE_PRI to be set
+        up already.
+
+        We also need to load build_config, not qt_module.
+
+        https://bugs.webkit.org/show_bug.cgi?id=90461
+
+        Reviewed by Tor Arne Vestbø.
+
+        * Source/api.pri:
+
 2012-07-06  Oswald Buddenhagen  <oswald.buddenhagen@nokia.com>
 

trunk/Source/api.pri

@@ -12 +12 @@
 haveQt(5) {
     # Use Qt5's module system
-    load(qt_module)
+    load(qt_build_config)
     MODULE = webkit
-    MODULE_PRI = $$QT.webkit.module_pri
+    MODULE_PRI = ../Tools/qmake/qt_webkit.pri
 
     BASE_TARGET = $$TARGET

trunk/Tools/ChangeLog

@@ +1 @@
+2012-07-06  Oswald Buddenhagen  <oswald.buddenhagen@nokia.com>
+
+        [Qt] Don't let qt_webkit.pri proclaim its own location
+
+        This won't work any more with recent Qt5 versions, as the forwarding
+        pri is created by qt_module_config, which needs MODULE_PRI to be set
+        up already.
+
+        We also need to load build_config, not qt_module.
+
+        https://bugs.webkit.org/show_bug.cgi?id=90461
+
+        Reviewed by Tor Arne Vestbø.
+
+        * qmake/qt_webkit.pri:
+
 2012-07-06  Oswald Buddenhagen  <oswald.buddenhagen@nokia.com>
 

trunk/Tools/qmake/qt_webkit.pri

@@ -14 +14 @@
 QT.webkit.libs = $$QT_MODULE_LIB_BASE
 QT.webkit.depends = core gui opengl network xmlpatterns script
-QT.webkit.module_pri = $$_FILE_
 
 !contains(QT_CONFIG, modular)|contains(QT_ELIGIBLE_MODULES, webkit) {