Title: [99684] trunk
- Revision
- 99684
- Author
- [email protected]
- Date
- 2011-11-09 03:55:49 -0800 (Wed, 09 Nov 2011)
Log Message
[Qt] Only copy framework headers once when debug_and_release is enabled
Otherwise we might end up in a race condition where we try to symlink
the headers directory in the makefile for debug and release at the same
time.
Reviewed by Simon Hausmann.
Modified Paths
Diff
Modified: trunk/ChangeLog (99683 => 99684)
--- trunk/ChangeLog 2011-11-09 11:49:13 UTC (rev 99683)
+++ trunk/ChangeLog 2011-11-09 11:55:49 UTC (rev 99684)
@@ -1,3 +1,15 @@
+2011-11-09 Tor Arne Vestbø <[email protected]>
+
+ [Qt] Only copy framework headers once when debug_and_release is enabled
+
+ Otherwise we might end up in a race condition where we try to symlink
+ the headers directory in the makefile for debug and release at the same
+ time.
+
+ Reviewed by Simon Hausmann.
+
+ * Source/api.pri:
+
2011-11-08 Martin Robinson <[email protected]>
Take another stab at fixing the GTK+ build.
Modified: trunk/Source/api.pri (99683 => 99684)
--- trunk/Source/api.pri 2011-11-09 11:49:13 UTC (rev 99683)
+++ trunk/Source/api.pri 2011-11-09 11:55:49 UTC (rev 99684)
@@ -199,10 +199,14 @@
}
CONFIG += lib_bundle qt_no_framework_direct_includes qt_framework
- FRAMEWORK_HEADERS.version = Versions
- FRAMEWORK_HEADERS.files = $$files($$headers.files, false)
- FRAMEWORK_HEADERS.path = Headers
- QMAKE_BUNDLE_DATA += FRAMEWORK_HEADERS
+
+ # For debug_and_release configs, only copy headers in release
+ !debug_and_release|if(build_pass:CONFIG(release, debug|release)) {
+ FRAMEWORK_HEADERS.version = Versions
+ FRAMEWORK_HEADERS.files = $$files($$headers.files, false)
+ FRAMEWORK_HEADERS.path = Headers
+ QMAKE_BUNDLE_DATA += FRAMEWORK_HEADERS
+ }
}
QMAKE_LFLAGS_SONAME = "$${QMAKE_LFLAGS_SONAME}$${DESTDIR}$${QMAKE_DIR_SEP}"
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
