Title: [121960] trunk
- Revision
- 121960
- Author
- o...@webkit.org
- Date
- 2012-07-06 06:13:07 -0700 (Fri, 06 Jul 2012)
Log Message
[Qt] Remove redundant CONFIG+=module
qt_module_config takes care of that.
In api.pri we are actually testing the flag ourselves, so now we need to
test a related flag qt_module_config sets instead.
.:
https://bugs.webkit.org/show_bug.cgi?id=90461
Patch by Oswald Buddenhagen <oswald.buddenha...@nokia.com> on 2012-07-06
Reviewed by Tor Arne Vestbø.
* Source/api.pri:
Tools:
Patch by Oswald Buddenhagen <oswald.buddenha...@nokia.com> on 2012-07-06
Reviewed by Tor Arne Vestbø.
* qmake/mkspecs/features/default_post.prf:
Modified Paths
Diff
Modified: trunk/ChangeLog (121959 => 121960)
--- trunk/ChangeLog 2012-07-06 13:12:01 UTC (rev 121959)
+++ trunk/ChangeLog 2012-07-06 13:13:07 UTC (rev 121960)
@@ -1,5 +1,20 @@
2012-07-06 Oswald Buddenhagen <oswald.buddenha...@nokia.com>
+ [Qt] Remove redundant CONFIG+=module
+
+ qt_module_config takes care of that.
+
+ In api.pri we are actually testing the flag ourselves, so now we need to
+ test a related flag qt_module_config sets instead.
+
+ https://bugs.webkit.org/show_bug.cgi?id=90461
+
+ Reviewed by Tor Arne Vestbø.
+
+ * Source/api.pri:
+
+2012-07-06 Oswald Buddenhagen <oswald.buddenha...@nokia.com>
+
[Qt] Adjust to changed generation of master include file
The responsiblity for creating the master include was moved out of syncqt.
Modified: trunk/Source/api.pri (121959 => 121960)
--- trunk/Source/api.pri 2012-07-06 13:12:01 UTC (rev 121959)
+++ trunk/Source/api.pri 2012-07-06 13:13:07 UTC (rev 121960)
@@ -14,7 +14,6 @@
load(qt_module)
MODULE = webkit
MODULE_PRI = $$QT.webkit.module_pri
- CONFIG += module
BASE_TARGET = $$TARGET
Modified: trunk/Tools/ChangeLog (121959 => 121960)
--- trunk/Tools/ChangeLog 2012-07-06 13:12:01 UTC (rev 121959)
+++ trunk/Tools/ChangeLog 2012-07-06 13:13:07 UTC (rev 121960)
@@ -1,5 +1,18 @@
2012-07-06 Oswald Buddenhagen <oswald.buddenha...@nokia.com>
+ [Qt] Remove redundant CONFIG+=module
+
+ qt_module_config takes care of that.
+
+ In api.pri we are actually testing the flag ourselves, so now we need to
+ test a related flag qt_module_config sets instead.
+
+ Reviewed by Tor Arne Vestbø.
+
+ * qmake/mkspecs/features/default_post.prf:
+
+2012-07-06 Oswald Buddenhagen <oswald.buddenha...@nokia.com>
+
[Qt] Switch to new-style Qt 5 configure tests
Use explicit project file action instead of syncqt magic.
Modified: trunk/Tools/qmake/mkspecs/features/default_post.prf (121959 => 121960)
--- trunk/Tools/qmake/mkspecs/features/default_post.prf 2012-07-06 13:12:01 UTC (rev 121959)
+++ trunk/Tools/qmake/mkspecs/features/default_post.prf 2012-07-06 13:13:07 UTC (rev 121960)
@@ -131,7 +131,7 @@
# Prevent name clashes when building both debug and release. Qt5's module
# system already takes care of this for the top level QtWebKit library.
- !module:debug_and_release: TARGET = $$qtLibraryTarget($$TARGET)
+ !qt_install_module:debug_and_release: TARGET = $$qtLibraryTarget($$TARGET)
isEmpty(DESTDIR): DESTDIR = $$activeBuildConfig()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
