Title: [121964] trunk
- Revision
- 121964
- Author
- [email protected]
- Date
- 2012-07-06 06:17:36 -0700 (Fri, 06 Jul 2012)
Log Message
[Qt] Add top-level .qmake.conf
With Qt5, this makes setting $QMAKEPATH externally unnecessary.
The magic in the perl scripts to set QMAKEPATH is still there, as it doesn't
hurt, and is still required for Qt4.
https://bugs.webkit.org/show_bug.cgi?id=90461
Patch by Oswald Buddenhagen <[email protected]> on 2012-07-06
Reviewed by Tor Arne Vestbø.
.:
* .qmake.conf: Added.
* WebKit.pro:
Tools:
* qmake/mkspecs/features/default_pre.prf:
Modified Paths
Added Paths
Diff
Added: trunk/.qmake.conf (0 => 121964)
--- trunk/.qmake.conf (rev 0)
+++ trunk/.qmake.conf 2012-07-06 13:17:36 UTC (rev 121964)
@@ -0,0 +1 @@
+QMAKEPATH += $$PWD/Tools/qmake $$shadowed($$PWD/Tools/qmake)
Modified: trunk/ChangeLog (121963 => 121964)
--- trunk/ChangeLog 2012-07-06 13:16:33 UTC (rev 121963)
+++ trunk/ChangeLog 2012-07-06 13:17:36 UTC (rev 121964)
@@ -1,5 +1,21 @@
2012-07-06 Oswald Buddenhagen <[email protected]>
+ [Qt] Add top-level .qmake.conf
+
+ With Qt5, this makes setting $QMAKEPATH externally unnecessary.
+
+ The magic in the perl scripts to set QMAKEPATH is still there, as it doesn't
+ hurt, and is still required for Qt4.
+
+ https://bugs.webkit.org/show_bug.cgi?id=90461
+
+ Reviewed by Tor Arne Vestbø.
+
+ * .qmake.conf: Added.
+ * WebKit.pro:
+
+2012-07-06 Oswald Buddenhagen <[email protected]>
+
[Qt] Let qt_module_config create the forwarding module pri file
https://bugs.webkit.org/show_bug.cgi?id=90461
Modified: trunk/Tools/ChangeLog (121963 => 121964)
--- trunk/Tools/ChangeLog 2012-07-06 13:16:33 UTC (rev 121963)
+++ trunk/Tools/ChangeLog 2012-07-06 13:17:36 UTC (rev 121964)
@@ -1,5 +1,20 @@
2012-07-06 Oswald Buddenhagen <[email protected]>
+ [Qt] Add top-level .qmake.conf
+
+ With Qt5, this makes setting $QMAKEPATH externally unnecessary.
+
+ The magic in the perl scripts to set QMAKEPATH is still there, as it doesn't
+ hurt, and is still required for Qt4.
+
+ https://bugs.webkit.org/show_bug.cgi?id=90461
+
+ Reviewed by Tor Arne Vestbø.
+
+ * qmake/mkspecs/features/default_pre.prf:
+
+2012-07-06 Oswald Buddenhagen <[email protected]>
+
[Qt] Unify qtFeatureDefaults code paths
There's no reason to run qmake on features.prf directly anymore, as we
Modified: trunk/Tools/qmake/mkspecs/features/default_pre.prf (121963 => 121964)
--- trunk/Tools/qmake/mkspecs/features/default_pre.prf 2012-07-06 13:16:33 UTC (rev 121963)
+++ trunk/Tools/qmake/mkspecs/features/default_pre.prf 2012-07-06 13:17:36 UTC (rev 121964)
@@ -69,9 +69,11 @@
isEmpty(pwd_starts_with_slash): CONFIG += win_cmd_shell
}
-# Make sure QMAKEPATH is set for recursive targets
-win_cmd_shell: QMAKE_QMAKE = \(set QMAKEPATH=$$(QMAKEPATH)\) && $$QMAKE_QMAKE
-else: QMAKE_QMAKE = QMAKEPATH=$$(QMAKEPATH) $$QMAKE_QMAKE
+haveQt(4) {
+ # Make sure QMAKEPATH is set for recursive targets
+ win_cmd_shell: QMAKE_QMAKE = \(set QMAKEPATH=$$(QMAKEPATH)\) && $$QMAKE_QMAKE
+ else: QMAKE_QMAKE = QMAKEPATH=$$(QMAKEPATH) $$QMAKE_QMAKE
+}
# Default location of generated sources
GENERATED_SOURCES_DESTDIR = generated
Modified: trunk/WebKit.pro (121963 => 121964)
--- trunk/WebKit.pro 2012-07-06 13:16:33 UTC (rev 121963)
+++ trunk/WebKit.pro 2012-07-06 13:17:36 UTC (rev 121964)
@@ -5,15 +5,17 @@
# See 'Tools/qmake/README' for an overview of the build system
# -------------------------------------------------------------------
+haveQt(4) {
+ QMAKEPATH = $$(QMAKEPATH)
+ isEmpty(QMAKEPATH)|!exists($${QMAKEPATH}/mkspecs) {
+ error("The environment variable QMAKEPATH needs to point to $WEBKITSRC/Tools/qmake")
+ # Otherwise we won't pick up the feature prf files needed for the build
+ }
+}
+
TEMPLATE = subdirs
CONFIG += ordered
-QMAKEPATH = $$(QMAKEPATH)
-isEmpty(QMAKEPATH)|!exists($${QMAKEPATH}/mkspecs) {
- error("The environment variable QMAKEPATH needs to point to $WEBKITSRC/Tools/qmake")
- # Otherwise we won't pick up the feature prf files needed for the build
-}
-
WTF.file = Source/WTF/WTF.pro
WTF.makefile = Makefile.WTF
SUBDIRS += WTF
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
