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 | |
| 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>
| m--------- | src/3rdparty | 0 | ||||
| -rw-r--r-- | src/webengine/doc/src/qtwebengine-platform-notes.qdoc | 2 | ||||
| -rw-r--r-- | src/webengine/ui_delegates_manager.cpp | 2 | ||||
| -rw-r--r-- | tools/qmake/mkspecs/features/functions.prf | 4 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/3rdparty b/src/3rdparty -Subproject b7204e81dcec1aa02e03b6bc499d811d0af6c5e +Subproject 9409dd36053110043e048ebdc5ded4c72f26f47 diff --git a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc index 86cccfa3c..fdaa4f861 100644 --- a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc +++ b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc @@ -45,7 +45,7 @@ In addition, the following tools are required for building the \l {Qt WebEngine} module: \list - \li Windows: Visual Studio 2013 or Visual Studio 2013 Express + \li Windows: Visual Studio 2013 or Visual Studio 2015 \li Linux: Clang or GCC version 4.7 or later \li OS X: Xcode version 5.1 or later \endlist diff --git a/src/webengine/ui_delegates_manager.cpp b/src/webengine/ui_delegates_manager.cpp index 4cc64c8c7..6c4282eb3 100644 --- a/src/webengine/ui_delegates_manager.cpp +++ b/src/webengine/ui_delegates_manager.cpp @@ -60,7 +60,7 @@ namespace QtWebEngineCore { #if defined(Q_OS_WIN) #define FILE_NAME_CASE_STATEMENT(TYPE, COMPONENT) \ case UIDelegatesManager::TYPE:\ - return QStringLiteral(#TYPE L ##".qml"); + return QString::fromLatin1(#TYPE ##".qml"); #else #define FILE_NAME_CASE_STATEMENT(TYPE, COMPONENT) \ case UIDelegatesManager::TYPE:\ 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) } |