diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-09-24 17:28:43 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-09-24 17:28:43 +0200 |
| commit | d8a590676b6c7d72406bd2f9b8185f38282fdfa7 (patch) | |
| tree | c081ff601ae4a56ecda95f52ca17e4bcfe402a1f /tools/qmake/mkspecs/features/functions.prf | |
| parent | 0c6147d9b5ffbe18bfe1e8deb9cc128c9a0fad27 (diff) | |
| parent | e643f766fa23ee73f7095d7ba20a385cef0f25a0 (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: Ice3d6e88238940a62d75e7c67f63b626285fccb0
Diffstat (limited to 'tools/qmake/mkspecs/features/functions.prf')
| -rw-r--r-- | tools/qmake/mkspecs/features/functions.prf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf index 0fda473c9..c0e1f90bb 100644 --- a/tools/qmake/mkspecs/features/functions.prf +++ b/tools/qmake/mkspecs/features/functions.prf @@ -14,7 +14,7 @@ defineTest(isPlatformSupported) { linux-g++*:!isGCCVersionSupported(): return(false) !isPythonVersionSupported(): return(false) - linux-g++*|linux-clang|win32-msvc2013|macx-clang: return(true) + linux-g++*|linux-clang|win32-msvc2013|macx-clang*: return(true) boot2qt: return(true) skipBuild("Qt WebEngine can currently only be built for Linux (GCC/clang), Windows (MSVC 2013), OS X (XCode 5.1+) or Qt for Device Creation.") |