Title: [147541] trunk/Source/WebCore
- Revision
- 147541
- Author
- ves...@webkit.org
- Date
- 2013-04-03 04:56:44 -0700 (Wed, 03 Apr 2013)
Log Message
[Qt] Update QMAKE_MAC_SDK check for Qt 5.1
Relies on QMAKE_MAC_SDK_VERSION set in features.prf
Reviewed by Simon Hausmann.
* WebCore.pri:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (147540 => 147541)
--- trunk/Source/WebCore/ChangeLog 2013-04-03 11:56:24 UTC (rev 147540)
+++ trunk/Source/WebCore/ChangeLog 2013-04-03 11:56:44 UTC (rev 147541)
@@ -1,3 +1,13 @@
+2013-04-03 Tor Arne Vestbø <tor.arne.ves...@digia.com>
+
+ [Qt] Update QMAKE_MAC_SDK check for Qt 5.1
+
+ Relies on QMAKE_MAC_SDK_VERSION set in features.prf
+
+ Reviewed by Simon Hausmann.
+
+ * WebCore.pri:
+
2013-04-03 Kristof Provost <kris...@codepro.be>
[Qt] assignToHTMLImageElement no longer exists in Qt5
Modified: trunk/Source/WebCore/WebCore.pri (147540 => 147541)
--- trunk/Source/WebCore/WebCore.pri 2013-04-03 11:56:24 UTC (rev 147540)
+++ trunk/Source/WebCore/WebCore.pri 2013-04-03 11:56:44 UTC (rev 147541)
@@ -189,20 +189,27 @@
DARWIN_VERSION = $$split(QMAKE_HOST.version, ".")
DARWIN_MAJOR_VERSION = $$first(DARWIN_VERSION)
- # We first check if a specific SDK is set to be used for the build.
- contains(QMAKE_MAC_SDK, ".*MacOSX10.7.sdk.*") {
- SYSTEM_LIBRARY_PATH = $${ROOT_WEBKIT_DIR}/WebKitLibraries/libWebKitSystemInterfaceLion.a
- } else:contains(QMAKE_MAC_SDK, ".*MacOSX10.8.sdk.*") {
- SYSTEM_LIBRARY_PATH = $${ROOT_WEBKIT_DIR}/WebKitLibraries/libWebKitSystemInterfaceMountainLion.a
- }
-
- # If the previous check did not yield a result, we resort to the Darwin version.
- isEmpty(SYSTEM_LIBRARY_PATH) {
- equals(DARWIN_MAJOR_VERSION, "11") {
+ haveQt(5,1) {
+ equals(QMAKE_MAC_SDK_VERSION, 10.7): \
SYSTEM_LIBRARY_PATH = $${ROOT_WEBKIT_DIR}/WebKitLibraries/libWebKitSystemInterfaceLion.a
- } else:equals(DARWIN_MAJOR_VERSION, "12") {
+ else:equals(QMAKE_MAC_SDK_VERSION, 10.8): \
SYSTEM_LIBRARY_PATH = $${ROOT_WEBKIT_DIR}/WebKitLibraries/libWebKitSystemInterfaceMountainLion.a
+ } else {
+ # We first check if a specific SDK is set to be used for the build.
+ contains(QMAKE_MAC_SDK, ".*MacOSX10.7.sdk.*") {
+ SYSTEM_LIBRARY_PATH = $${ROOT_WEBKIT_DIR}/WebKitLibraries/libWebKitSystemInterfaceLion.a
+ } else:contains(QMAKE_MAC_SDK, ".*MacOSX10.8.sdk.*") {
+ SYSTEM_LIBRARY_PATH = $${ROOT_WEBKIT_DIR}/WebKitLibraries/libWebKitSystemInterfaceMountainLion.a
}
+
+ # If the previous check did not yield a result, we resort to the Darwin version.
+ isEmpty(SYSTEM_LIBRARY_PATH) {
+ equals(DARWIN_MAJOR_VERSION, "11") {
+ SYSTEM_LIBRARY_PATH = $${ROOT_WEBKIT_DIR}/WebKitLibraries/libWebKitSystemInterfaceLion.a
+ } else:equals(DARWIN_MAJOR_VERSION, "12") {
+ SYSTEM_LIBRARY_PATH = $${ROOT_WEBKIT_DIR}/WebKitLibraries/libWebKitSystemInterfaceMountainLion.a
+ }
+ }
}
LIBS += $$SYSTEM_LIBRARY_PATH
} else:use?(GSTREAMER) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
