Title: [144464] trunk/Source/WebCore
- Revision
- 144464
- Author
- [email protected]
- Date
- 2013-03-01 09:30:48 -0800 (Fri, 01 Mar 2013)
Log Message
[Qt] Fix the Mac build with the current qtbase/dev branch
https://bugs.webkit.org/show_bug.cgi?id=111190
Reviewed by Allan Sandfeld Jensen.
QMAKE_MACOSX_DEPLOYMENT_TARGET now influences
__MAC_OS_X_VERSION_MIN_REQUIRED through -mmacosx-version-min after
changes in qtbase to support iOS.
Having only WebCore defining it to 10.5 would create a mismatch of
ENABLE_THREADING_LIBDISPATCH with WTF to cause undefined symbols
while linking both together at the end.
Fix it by removing the statement which isn't needed anymore.
qtbase/mkspecs/common/mac-minimum-version.conf already defines
10.6 as the minimum Mac version.
* Target.pri:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (144463 => 144464)
--- trunk/Source/WebCore/ChangeLog 2013-03-01 17:06:34 UTC (rev 144463)
+++ trunk/Source/WebCore/ChangeLog 2013-03-01 17:30:48 UTC (rev 144464)
@@ -1,3 +1,24 @@
+2013-03-01 Jocelyn Turcotte <[email protected]>
+
+ [Qt] Fix the Mac build with the current qtbase/dev branch
+ https://bugs.webkit.org/show_bug.cgi?id=111190
+
+ Reviewed by Allan Sandfeld Jensen.
+
+ QMAKE_MACOSX_DEPLOYMENT_TARGET now influences
+ __MAC_OS_X_VERSION_MIN_REQUIRED through -mmacosx-version-min after
+ changes in qtbase to support iOS.
+
+ Having only WebCore defining it to 10.5 would create a mismatch of
+ ENABLE_THREADING_LIBDISPATCH with WTF to cause undefined symbols
+ while linking both together at the end.
+
+ Fix it by removing the statement which isn't needed anymore.
+ qtbase/mkspecs/common/mac-minimum-version.conf already defines
+ 10.6 as the minimum Mac version.
+
+ * Target.pri:
+
2013-03-01 Vsevolod Vlasov <[email protected]>
Web Inspector: [Regression] Snippets renaming is broken.
Modified: trunk/Source/WebCore/Target.pri (144463 => 144464)
--- trunk/Source/WebCore/Target.pri 2013-03-01 17:06:34 UTC (rev 144463)
+++ trunk/Source/WebCore/Target.pri 2013-03-01 17:30:48 UTC (rev 144464)
@@ -3372,8 +3372,6 @@
DEFINES+=NS_BUILD_32_LIKE_64
}
- QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5
-
} else: use?(GSTREAMER) {
HEADERS += \
platform/graphics/gstreamer/GStreamerGWorld.h \
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
