Title: [98114] trunk/Source/WebKit/qt
- Revision
- 98114
- Author
- commit-qu...@webkit.org
- Date
- 2011-10-21 10:55:50 -0700 (Fri, 21 Oct 2011)
Log Message
[Qt] WebKit build does not respect QMAKE_MAC_SDK variable.
https://bugs.webkit.org/show_bug.cgi?id=70596
Instead of only relying on DARWIN_MAJOR_VERSION we also
check QMAKE_MAC_SDK. In case QMAKE_MAC_SDK is not defined
we are still falling back to DARWIN_MAJOR_VERSION.
Patch by Andy Shaw <andy.s...@digia.com>
Patch by Zeno Albisser <zeno.albis...@nokia.com> on 2011-10-21
Reviewed by Noam Rosenthal.
* QtWebKit.pro:
Modified Paths
Diff
Modified: trunk/Source/WebKit/qt/ChangeLog (98113 => 98114)
--- trunk/Source/WebKit/qt/ChangeLog 2011-10-21 17:46:34 UTC (rev 98113)
+++ trunk/Source/WebKit/qt/ChangeLog 2011-10-21 17:55:50 UTC (rev 98114)
@@ -1,3 +1,18 @@
+2011-10-21 Zeno Albisser <zeno.albis...@nokia.com>
+
+ [Qt] WebKit build does not respect QMAKE_MAC_SDK variable.
+ https://bugs.webkit.org/show_bug.cgi?id=70596
+
+ Instead of only relying on DARWIN_MAJOR_VERSION we also
+ check QMAKE_MAC_SDK. In case QMAKE_MAC_SDK is not defined
+ we are still falling back to DARWIN_MAJOR_VERSION.
+
+ Patch by Andy Shaw <andy.s...@digia.com>
+
+ Reviewed by Noam Rosenthal.
+
+ * QtWebKit.pro:
+
2011-10-21 Csaba Osztrogonác <o...@webkit.org>
[Qt][WK2] Typo fix.
Modified: trunk/Source/WebKit/qt/QtWebKit.pro (98113 => 98114)
--- trunk/Source/WebKit/qt/QtWebKit.pro 2011-10-21 17:46:34 UTC (rev 98113)
+++ trunk/Source/WebKit/qt/QtWebKit.pro 2011-10-21 17:55:50 UTC (rev 98114)
@@ -191,12 +191,12 @@
# We can know the Mac OS version by using the Darwin major version
DARWIN_VERSION = $$split(QMAKE_HOST.version, ".")
DARWIN_MAJOR_VERSION = $$first(DARWIN_VERSION)
- equals(DARWIN_MAJOR_VERSION, "11") {
+ equals(DARWIN_MAJOR_VERSION, "9") | contains(QMAKE_MAC_SDK, "/Developer/SDKs/MacOSX10.5.sdk") {
+ LIBS += $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceLeopard.a
+ } else: equals(DARWIN_MAJOR_VERSION, "10") | contains(QMAKE_MAC_SDK, "/Developer/SDKs/MacOSX10.6.sdk") {
+ LIBS += $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a
+ } else: equals(DARWIN_MAJOR_VERSION, "11") | contains(QMAKE_MAC_SDK, "/Developer/SDKs/MacOSX10.7.sdk") {
LIBS += $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceLion.a
- } else:equals(DARWIN_MAJOR_VERSION, "10") {
- LIBS += $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a
- } else:equals(DARWIN_MAJOR_VERSION, "9") {
- LIBS += $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceLeopard.a
}
}
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
