diff options
| author | Danny Boelens <dannyb@enfocus.com> | 2013-04-17 13:18:37 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-31 19:32:30 (GMT) |
| commit | 07e96da1d3c5fb01cc969be20452770e62475fcc (patch) | |
| tree | f517232908c1e9a30e99b4b5ca0d43c80ede8bbf /src | |
| parent | 466930aa3c942dada0139b73dbcbab71d9d39489 (diff) | |
| download | Qt-07e96da1d3c5fb01cc969be20452770e62475fcc.zip Qt-07e96da1d3c5fb01cc969be20452770e62475fcc.tar.gz Qt-07e96da1d3c5fb01cc969be20452770e62475fcc.tar.bz2 | |
Fix Qt WebKit build for non-default Xcode setup / Xcode 4.3+
There's no need to test the full path, the actual name of the SDK will do.
This fixes the build in cases where Xcode is not installed in /Developer
or when building with Xcode 4.3 or higher (where Xcode is a bundle), because
in those cases the SDK's full path does not start with /Developer.
Change-Id: I598ba2a5ebaae813f576dc72102d05fe8804a86f
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro b/src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro index 847f6f4..f2cb3d5 100644 --- a/src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro +++ b/src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro @@ -247,13 +247,13 @@ contains(DEFINES, ENABLE_VIDEO=1) { # 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, "9") | contains(QMAKE_MAC_SDK, "/Developer/SDKs/MacOSX10.5.sdk") { + equals(DARWIN_MAJOR_VERSION, "9") | contains(QMAKE_MAC_SDK, ".*MacOSX10.5.sdk") { LIBS += $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceLeopard.a - } else: equals(DARWIN_MAJOR_VERSION, "10") | contains(QMAKE_MAC_SDK, "/Developer/SDKs/MacOSX10.6.sdk") { + } else: equals(DARWIN_MAJOR_VERSION, "10") | contains(QMAKE_MAC_SDK, ".*MacOSX10.6.sdk") { LIBS += $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a - } else: equals(DARWIN_MAJOR_VERSION, "11") | contains(QMAKE_MAC_SDK, "/Developer/SDKs/MacOSX10.7.sdk") { + } else: equals(DARWIN_MAJOR_VERSION, "11") | contains(QMAKE_MAC_SDK, ".*MacOSX10.7.sdk") { LIBS += $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceLion.a - } else: equals(DARWIN_MAJOR_VERSION, "12") | contains(QMAKE_MAC_SDK, "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk") { + } else: equals(DARWIN_MAJOR_VERSION, "12") | contains(QMAKE_MAC_SDK, ".*MacOSX10.8.sdk") { LIBS += $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceMountainLion.a } } |