Title: [144306] trunk/Tools
- Revision
- 144306
- Author
- [email protected]
- Date
- 2013-02-28 07:03:06 -0800 (Thu, 28 Feb 2013)
Log Message
[Qt] Enable thin archives before parsing the project files
Rubber-stamped by Simon Hausmann.
The targetSubDir() function can be called before default_post.prf has been
parsed therefore the gnu_thin_archives option has to be set in default_pre.prf
which is parsed before the main project file.
This issue was revealed by r144299 and fixes the clean build.
* qmake/mkspecs/features/default_post.prf:
* qmake/mkspecs/features/default_pre.prf:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (144305 => 144306)
--- trunk/Tools/ChangeLog 2013-02-28 14:53:35 UTC (rev 144305)
+++ trunk/Tools/ChangeLog 2013-02-28 15:03:06 UTC (rev 144306)
@@ -1,3 +1,17 @@
+2013-02-28 Andras Becsi <[email protected]>
+
+ [Qt] Enable thin archives before parsing the project files
+
+ Rubber-stamped by Simon Hausmann.
+
+ The targetSubDir() function can be called before default_post.prf has been
+ parsed therefore the gnu_thin_archives option has to be set in default_pre.prf
+ which is parsed before the main project file.
+ This issue was revealed by r144299 and fixes the clean build.
+
+ * qmake/mkspecs/features/default_post.prf:
+ * qmake/mkspecs/features/default_pre.prf:
+
2013-02-28 Allan Sandfeld Jensen <[email protected]>
[Qt] Enable CANVAS_PATH flag
Modified: trunk/Tools/qmake/mkspecs/features/default_post.prf (144305 => 144306)
--- trunk/Tools/qmake/mkspecs/features/default_post.prf 2013-02-28 14:53:35 UTC (rev 144305)
+++ trunk/Tools/qmake/mkspecs/features/default_post.prf 2013-02-28 15:03:06 UTC (rev 144306)
@@ -14,7 +14,6 @@
# Avoid it with debug_and_release, it can cause the application to load both the debug and release
# dependent libraries when using frameworks on Mac.
!production_build:!debug_and_release:!buildbot:!win*:!build?(webkit2): CONFIG += force_static_libs_as_shared
-!debug_and_release:*-g++*: CONFIG += gnu_thin_archives
# Don't create .prl files for intermediate libraries because their contents get used when linking against
# them, breaking "-Wl,-whole-archive -lMyIntermediateLib --Wl,-no-whole-archive"
Modified: trunk/Tools/qmake/mkspecs/features/default_pre.prf (144305 => 144306)
--- trunk/Tools/qmake/mkspecs/features/default_pre.prf 2013-02-28 14:53:35 UTC (rev 144305)
+++ trunk/Tools/qmake/mkspecs/features/default_pre.prf 2013-02-28 15:03:06 UTC (rev 144306)
@@ -92,6 +92,8 @@
# used by bots and developers, will disable it, to enable warnings etc.
CONFIG += production_build
+!debug_and_release:*-g++*: CONFIG += gnu_thin_archives
+
# Pick up Qt's defaults for debug/release/debug_and_release
if(win32|mac):!macx-xcode {
contains(QT_CONFIG, debug_and_release): CONFIG += debug_and_release
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
