Title: [137314] trunk/Tools
- Revision
- 137314
- Author
- [email protected]
- Date
- 2012-12-11 07:46:16 -0800 (Tue, 11 Dec 2012)
Log Message
[Qt] remove hack which avoids unused .obj directories all over the place
Patch by Oswald Buddenhagen <[email protected]> on 2012-12-11
Reviewed by Simon Hausmann.
The feature is subject to upstreaming in Qt itself in
https://codereview.qt-project.org/#change,42011
* qmake/mkspecs/features/default_post.prf:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (137313 => 137314)
--- trunk/Tools/ChangeLog 2012-12-11 15:33:41 UTC (rev 137313)
+++ trunk/Tools/ChangeLog 2012-12-11 15:46:16 UTC (rev 137314)
@@ -1,5 +1,16 @@
2012-12-11 Oswald Buddenhagen <[email protected]>
+ [Qt] remove hack which avoids unused .obj directories all over the place
+
+ Reviewed by Simon Hausmann.
+
+ The feature is subject to upstreaming in Qt itself in
+ https://codereview.qt-project.org/#change,42011
+
+ * qmake/mkspecs/features/default_post.prf:
+
+2012-12-11 Oswald Buddenhagen <[email protected]>
+
[Qt] move SQLITE3SRCDIR assignment to only use site
Reviewed by Simon Hausmann.
Modified: trunk/Tools/qmake/mkspecs/features/default_post.prf (137313 => 137314)
--- trunk/Tools/qmake/mkspecs/features/default_post.prf 2012-12-11 15:33:41 UTC (rev 137313)
+++ trunk/Tools/qmake/mkspecs/features/default_post.prf 2012-12-11 15:46:16 UTC (rev 137314)
@@ -249,12 +249,6 @@
incremental.commands = $(MAKE) -f $(MAKEFILE) qmake_all && $(MAKE) -f $(MAKEFILE)
QMAKE_EXTRA_TARGETS += incremental
-# Don't set OBJECTS_DIR for subdirs, as that will unconditionally
-# create the directory, even if we're not using it.
-contains(TEMPLATE, subdirs) {
- unset(OBJECTS_DIR)
-}
-
contains(TEMPLATE, lib) {
# Triggers the right export macros for WebKit internals
DEFINES += BUILDING_$${TARGET}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
