Title: [99564] trunk
- Revision
- 99564
- Author
- ves...@webkit.org
- Date
- 2011-11-08 06:40:46 -0800 (Tue, 08 Nov 2011)
Log Message
[Qt] Don't set OBJECTS_DIR and DEFINES in default_pre
If a pro file needs to access the OBJECTS_DIR it should use the
form ${QMAKE_VAR_OBJECTS_DIR} to ensure the value is evaluated
after defaults_post has been processed.
Setting DEFINES in defaults_pre is also bad, as any DEFINES=foo on
the command line will override whatever we set in defaults_pre.
Reviewed by Simon Hausmann.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (99563 => 99564)
--- trunk/Source/WebCore/ChangeLog 2011-11-08 14:36:47 UTC (rev 99563)
+++ trunk/Source/WebCore/ChangeLog 2011-11-08 14:40:46 UTC (rev 99564)
@@ -1,3 +1,18 @@
+2011-11-08 Tor Arne Vestbø <tor.arne.ves...@nokia.com>
+
+ [Qt] Don't set OBJECTS_DIR and DEFINES in default_pre
+
+ If a pro file needs to access the OBJECTS_DIR it should use the
+ form ${QMAKE_VAR_OBJECTS_DIR} to ensure the value is evaluated
+ after defaults_post has been processed.
+
+ Setting DEFINES in defaults_pre is also bad, as any DEFINES=foo on
+ the command line will override whatever we set in defaults_pre.
+
+ Reviewed by Simon Hausmann.
+
+ * Target.pri:
+
2011-11-08 Pavel Feldman <pfeld...@google.com>
Web Inspector: add _javascript_ keywords to the autocomplete.
Modified: trunk/Source/WebCore/Target.pri (99563 => 99564)
--- trunk/Source/WebCore/Target.pri 2011-11-08 14:36:47 UTC (rev 99563)
+++ trunk/Source/WebCore/Target.pri 2011-11-08 14:40:46 UTC (rev 99564)
@@ -3787,7 +3787,7 @@
ANGLE_CFLAGS += -Wno-reorder
angle_cxx.commands = $$QMAKE_CXX -c $(CXXFLAGS) $$ANGLE_CFLAGS $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
- angle_cxx.output = $$OBJECTS_DIR/${QMAKE_FILE_BASE}$$QMAKE_EXT_OBJ
+ angle_cxx.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$$QMAKE_EXT_OBJ
anglc_cxx.dependency_type = TYPE_C
angle_cxx.depends = $$ANGLE_HEADERS
angle_cxx.input = ANGLE_SOURCES
Modified: trunk/Tools/ChangeLog (99563 => 99564)
--- trunk/Tools/ChangeLog 2011-11-08 14:36:47 UTC (rev 99563)
+++ trunk/Tools/ChangeLog 2011-11-08 14:40:46 UTC (rev 99564)
@@ -1,5 +1,21 @@
2011-11-08 Tor Arne Vestbø <tor.arne.ves...@nokia.com>
+ [Qt] Don't set OBJECTS_DIR and DEFINES in default_pre
+
+ If a pro file needs to access the OBJECTS_DIR it should use the
+ form ${QMAKE_VAR_OBJECTS_DIR} to ensure the value is evaluated
+ after defaults_post has been processed.
+
+ Setting DEFINES in defaults_pre is also bad, as any DEFINES=foo on
+ the command line will override whatever we set in defaults_pre.
+
+ Reviewed by Simon Hausmann.
+
+ * qmake/mkspecs/features/default_post.prf:
+ * qmake/mkspecs/features/default_pre.prf:
+
+2011-11-08 Tor Arne Vestbø <tor.arne.ves...@nokia.com>
+
[Qt] Prevent duplicated sources in SOURCES/OBJECTIVE_SOURCES
Reviewed by Simon Hausmann.
Modified: trunk/Tools/qmake/mkspecs/features/default_post.prf (99563 => 99564)
--- trunk/Tools/qmake/mkspecs/features/default_post.prf 2011-11-08 14:36:47 UTC (rev 99563)
+++ trunk/Tools/qmake/mkspecs/features/default_post.prf 2011-11-08 14:40:46 UTC (rev 99564)
@@ -19,10 +19,19 @@
}
}
+# Help keep the build tree clean
+MOC_DIR = moc
+RCC_DIR = rcc
+
+!CONFIG(release, debug|release): OBJECTS_DIR = obj/debug
+else: OBJECTS_DIR = obj/release
+
# General default build tweaks
DEFINES += \
BUILDING_QT__=1
+CONFIG(release, debug|release): DEFINES *= NDEBUG
+
CONFIG += depend_includepath
DEPENDPATH += $$OUT_PWD
Modified: trunk/Tools/qmake/mkspecs/features/default_pre.prf (99563 => 99564)
--- trunk/Tools/qmake/mkspecs/features/default_pre.prf 2011-11-08 14:36:47 UTC (rev 99563)
+++ trunk/Tools/qmake/mkspecs/features/default_pre.prf 2011-11-08 14:40:46 UTC (rev 99564)
@@ -103,14 +103,3 @@
CONFIG += include_webinspector
*sh4*: CONFIG += disable_uitools
-
-# Help keep the build tree clean
-MOC_DIR = moc
-RCC_DIR = rcc
-
-!CONFIG(release, debug|release) {
- OBJECTS_DIR = obj/debug
-} else { # Release
- OBJECTS_DIR = obj/release
- DEFINES *= NDEBUG
-}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
