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 /src/webengine/ui_delegates_manager.cpp | |
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 'src/webengine/ui_delegates_manager.cpp')
-rw-r--r-- | src/webengine/ui_delegates_manager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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:\ |