Commit 98ac42c7 authored by Zoltan Arvai's avatar Zoltan Arvai Committed by The Qt Project
Browse files

Fix string concatenation in WebEngine on Windows


MSVC thinks the firs part of that string is wide while the second
part is narrow and it won't allow to concetanete them directly.
Adding literal for wide string before ".qml" on Windows will
resolve it.

Change-Id: I934fed6fe9e9401461a8165a524e8110cec3c3fa
Reviewed-by: default avatarJocelyn Turcotte <jocelyn.turcotte@digia.com>
Showing with 6 additions and 0 deletions
...@@ -58,9 +58,15 @@ ...@@ -58,9 +58,15 @@
//#define UI_DELEGATES_DEBUG //#define UI_DELEGATES_DEBUG
#define NO_SEPARATOR #define NO_SEPARATOR
#if defined(Q_OS_WIN)
#define FILE_NAME_CASE_STATEMENT(TYPE, COMPONENT) \
case UIDelegatesManager::TYPE:\
return QStringLiteral(#TYPE L ##".qml");
#else
#define FILE_NAME_CASE_STATEMENT(TYPE, COMPONENT) \ #define FILE_NAME_CASE_STATEMENT(TYPE, COMPONENT) \
case UIDelegatesManager::TYPE:\ case UIDelegatesManager::TYPE:\
return QStringLiteral(#TYPE".qml"); return QStringLiteral(#TYPE".qml");
#endif
static QString fileNameForComponent(UIDelegatesManager::ComponentType type) static QString fileNameForComponent(UIDelegatesManager::ComponentType type)
{ {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment