Title: [121961] trunk
- Revision
- 121961
- Author
- [email protected]
- Date
- 2012-07-06 06:14:20 -0700 (Fri, 06 Jul 2012)
Log 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 <[email protected]> on 2012-07-06
Reviewed by Tor Arne Vestbø.
.:
* Source/api.pri:
Tools:
* qmake/qt_webkit.pri:
Modified Paths
Diff
Modified: trunk/ChangeLog (121960 => 121961)
--- trunk/ChangeLog 2012-07-06 13:13:07 UTC (rev 121960)
+++ trunk/ChangeLog 2012-07-06 13:14:20 UTC (rev 121961)
@@ -1,5 +1,21 @@
2012-07-06 Oswald Buddenhagen <[email protected]>
+ [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 <[email protected]>
+
[Qt] Remove redundant CONFIG+=module
qt_module_config takes care of that.
Modified: trunk/Source/api.pri (121960 => 121961)
--- trunk/Source/api.pri 2012-07-06 13:13:07 UTC (rev 121960)
+++ trunk/Source/api.pri 2012-07-06 13:14:20 UTC (rev 121961)
@@ -11,9 +11,9 @@
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
Modified: trunk/Tools/ChangeLog (121960 => 121961)
--- trunk/Tools/ChangeLog 2012-07-06 13:13:07 UTC (rev 121960)
+++ trunk/Tools/ChangeLog 2012-07-06 13:14:20 UTC (rev 121961)
@@ -1,5 +1,21 @@
2012-07-06 Oswald Buddenhagen <[email protected]>
+ [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 <[email protected]>
+
[Qt] Remove redundant CONFIG+=module
qt_module_config takes care of that.
Modified: trunk/Tools/qmake/qt_webkit.pri (121960 => 121961)
--- trunk/Tools/qmake/qt_webkit.pri 2012-07-06 13:13:07 UTC (rev 121960)
+++ trunk/Tools/qmake/qt_webkit.pri 2012-07-06 13:14:20 UTC (rev 121961)
@@ -13,7 +13,6 @@
QT.webkit.sources = $$QT_MODULE_BASE
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) {
QT_CONFIG += webkit
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
