Title: [131723] trunk
- Revision
- 131723
- Author
- [email protected]
- Date
- 2012-10-18 03:38:18 -0700 (Thu, 18 Oct 2012)
Log Message
[Qt] Clean up variables controlling Qt module creation/handling
Reviewed by Tor Arne Vestbø.
We now depend on a Qt 5 version that is new enough to allow us to
clean this up. Qt's default_pre.prf uses MODULE_QMAKE_OUTDIR, but
the other MODULE_BASE_* variables are onl used in qmodule.prf.
.:
* Source/api.pri:
Tools:
* qmake/mkspecs/features/default_pre.prf:
Modified Paths
Diff
Modified: trunk/ChangeLog (131722 => 131723)
--- trunk/ChangeLog 2012-10-18 10:25:25 UTC (rev 131722)
+++ trunk/ChangeLog 2012-10-18 10:38:18 UTC (rev 131723)
@@ -1,3 +1,15 @@
+2012-10-18 Simon Hausmann <[email protected]>
+
+ [Qt] Clean up variables controlling Qt module creation/handling
+
+ Reviewed by Tor Arne Vestbø.
+
+ We now depend on a Qt 5 version that is new enough to allow us to
+ clean this up. Qt's default_pre.prf uses MODULE_QMAKE_OUTDIR, but
+ the other MODULE_BASE_* variables are onl used in qmodule.prf.
+
+ * Source/api.pri:
+
2012-10-17 Tor Arne Vestbø <[email protected]>
[Qt] Modularize documentation for QtWebKit
Modified: trunk/Source/api.pri (131722 => 131723)
--- trunk/Source/api.pri 2012-10-18 10:25:25 UTC (rev 131722)
+++ trunk/Source/api.pri 2012-10-18 10:38:18 UTC (rev 131723)
@@ -31,12 +31,9 @@
QT_API_DEPENDS = core gui network
build?(webkit1): QT_API_DEPENDS += widgets
-qmakeVersion=$$[QMAKE_VERSION]
-equals(qmakeVersion, 3.0) {
- # We want the QtWebKit API forwarding includes to live in the root build dir.
- MODULE_BASE_DIR = $$_PRO_FILE_PWD_
- MODULE_BASE_OUTDIR = $$ROOT_BUILD_DIR
-}
+# We want the QtWebKit API forwarding includes to live in the root build dir.
+MODULE_BASE_DIR = $$_PRO_FILE_PWD_
+MODULE_BASE_OUTDIR = $$ROOT_BUILD_DIR
QMAKE_DOCS = $$PWD/qtwebkit.qdocconf
Modified: trunk/Tools/ChangeLog (131722 => 131723)
--- trunk/Tools/ChangeLog 2012-10-18 10:25:25 UTC (rev 131722)
+++ trunk/Tools/ChangeLog 2012-10-18 10:38:18 UTC (rev 131723)
@@ -1,5 +1,17 @@
2012-10-18 Simon Hausmann <[email protected]>
+ [Qt] Clean up variables controlling Qt module creation/handling
+
+ Reviewed by Tor Arne Vestbø.
+
+ We now depend on a Qt 5 version that is new enough to allow us to
+ clean this up. Qt's default_pre.prf uses MODULE_QMAKE_OUTDIR, but
+ the other MODULE_BASE_* variables are onl used in qmodule.prf.
+
+ * qmake/mkspecs/features/default_pre.prf:
+
+2012-10-18 Simon Hausmann <[email protected]>
+
[Qt] Reduce memory pressure during link time
Reviewed by Tor Arne Vestbø.
Modified: trunk/Tools/qmake/mkspecs/features/default_pre.prf (131722 => 131723)
--- trunk/Tools/qmake/mkspecs/features/default_pre.prf 2012-10-18 10:25:25 UTC (rev 131722)
+++ trunk/Tools/qmake/mkspecs/features/default_pre.prf 2012-10-18 10:38:18 UTC (rev 131723)
@@ -25,13 +25,7 @@
WEBKIT_SUBDIR = $$replace(_PRO_FILE_PWD_, $${ROOT_WEBKIT_DIR},)
ROOT_BUILD_DIR = $$replace(OUT_PWD, $${WEBKIT_SUBDIR}$,)
-# ### FIXME: Remove this after Qt 5 beta 2. Syncqt is not called from default_pre.prf
-# anymore, so this was moved to api.pri.
-# We want the QtWebKit API forwarding includes to live in the root build dir.
-MODULE_BASE_DIR = $$ROOT_WEBKIT_DIR
-MODULE_BASE_OUTDIR = $$ROOT_BUILD_DIR
-
-# The qmake files on the other hand live in a subdirectory.
+# The qmake generated module files belong into our Tools/qmake dir
MODULE_QMAKE_OUTDIR = $$ROOT_BUILD_DIR/Tools/qmake
# Now we're ready to load default_pre from Qt
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
