Title: [132042] trunk/Tools
- Revision
- 132042
- Author
- ves...@webkit.org
- Date
- 2012-10-22 01:43:56 -0700 (Mon, 22 Oct 2012)
Log Message
[Qt] Move OBJECTS_DIR and friends to default_pre.prf
The introduction of load(qt_build_config) in .qmake.conf meant
that we started loading qtmodule.pri, which in turn set both
MOC_DIR, RCC_DIR, and OBJECTS_DIR.
We were setting OBJECTS_DIR in default_post under a isEmpty() guard
so that project files could override the objects dir. Instead of
using the isEmpty() check we move it to defaul_pre, which will
override the qtmodule.pri settings, but still allow project files
to override it.
Reviewed by Ossy.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (132041 => 132042)
--- trunk/Tools/ChangeLog 2012-10-22 08:42:08 UTC (rev 132041)
+++ trunk/Tools/ChangeLog 2012-10-22 08:43:56 UTC (rev 132042)
@@ -1,3 +1,22 @@
+2012-10-22 Tor Arne Vestbø <tor.arne.ves...@digia.com>
+
+ [Qt] Move OBJECTS_DIR and friends to default_pre.prf
+
+ The introduction of load(qt_build_config) in .qmake.conf meant
+ that we started loading qtmodule.pri, which in turn set both
+ MOC_DIR, RCC_DIR, and OBJECTS_DIR.
+
+ We were setting OBJECTS_DIR in default_post under a isEmpty() guard
+ so that project files could override the objects dir. Instead of
+ using the isEmpty() check we move it to defaul_pre, which will
+ override the qtmodule.pri settings, but still allow project files
+ to override it.
+
+ Reviewed by Ossy.
+
+ * qmake/mkspecs/features/default_post.prf:
+ * qmake/mkspecs/features/default_pre.prf:
+
2012-10-22 Mikhail Pozdnyakov <mikhail.pozdnya...@intel.com>
WebKitTestRunner needs testRunner.queueLoadingScript and testRunner.queueNonLoadingScript
Modified: trunk/Tools/qmake/mkspecs/features/default_post.prf (132041 => 132042)
--- trunk/Tools/qmake/mkspecs/features/default_post.prf 2012-10-22 08:42:08 UTC (rev 132041)
+++ trunk/Tools/qmake/mkspecs/features/default_post.prf 2012-10-22 08:43:56 UTC (rev 132042)
@@ -28,11 +28,6 @@
}
}
-# Help keep the build tree clean
-MOC_DIR = moc
-RCC_DIR = rcc
-isEmpty(OBJECTS_DIR): OBJECTS_DIR = obj/$$activeBuildConfig()
-
# General default build tweaks
DEFINES += \
BUILDING_QT__=1
Modified: trunk/Tools/qmake/mkspecs/features/default_pre.prf (132041 => 132042)
--- trunk/Tools/qmake/mkspecs/features/default_pre.prf 2012-10-22 08:42:08 UTC (rev 132041)
+++ trunk/Tools/qmake/mkspecs/features/default_pre.prf 2012-10-22 08:43:56 UTC (rev 132042)
@@ -69,6 +69,11 @@
MAKEFILE_NOOP_COMMAND = @echo -n
win32-msvc*: MAKEFILE_NOOP_COMMAND = @echo >NUL
+# Help keep the build tree clean
+MOC_DIR = moc
+RCC_DIR = rcc
+OBJECTS_DIR = obj/$$activeBuildConfig()
+
# Set up a default python version
scratchbox: PYTHON = python2.6
else: PYTHON = python
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
