diff options
| author | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-10-19 12:40:41 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-10-19 13:05:39 +0000 |
| commit | 751d976ea301f793bee9c5917053b2fc3ec42e51 (patch) | |
| tree | 996b723af1b3a7ba11268e0f5526d638febab8a7 /tools/qmake | |
| parent | 0e9555838c83ccf5a6a28ee99d6fd556ebf5b3b2 (diff) | |
Enable building with MSVC 2015
Enable MSVC 2015 in prechecks and fix
error C2308: concatenating mismatched strings
Task-number: QTBUG-47541
Change-Id: Ia583e2963c7e6ef8327909b91c8df04aeb17eb07
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
Diffstat (limited to 'tools/qmake')
| -rw-r--r-- | tools/qmake/mkspecs/features/functions.prf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf index 3a86beb80..9f54f4f3c 100644 --- a/tools/qmake/mkspecs/features/functions.prf +++ b/tools/qmake/mkspecs/features/functions.prf @@ -22,10 +22,10 @@ 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*|win32-msvc2015*|macx-clang*: return(true) boot2qt: return(true) - skipBuild("Qt WebEngine can currently only be built for Linux (GCC/clang), Windows (MSVC 2013), OS X (10.9/XCode 5.1+) or Qt for Device Creation.") + skipBuild("Qt WebEngine can currently only be built for Linux (GCC/clang), Windows (MSVC 2013 or 2015), OS X (10.9/XCode 5.1+) or Qt for Device Creation.") return(false) } |