summaryrefslogtreecommitdiffstats
path: root/src/webengine
diff options
context:
space:
mode:
authorZoltan Arvai <zarvai@inf.u-szeged.hu>2014-02-06 22:55:41 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-11 14:59:34 +0100
commit98ac42c78dc9118eacf85f9f817b7d287d9ff02d (patch)
tree9f4b0c9baf81d02fdd51b306629c4a3efdc8ca96 /src/webengine
parentd962355ebe007ef663fc3d7c3c74e1a3a027f694 (diff)
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: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'src/webengine')
-rw-r--r--src/webengine/ui_delegates_manager.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/webengine/ui_delegates_manager.cpp b/src/webengine/ui_delegates_manager.cpp
index 13e4a9fce..1402c7625 100644
--- a/src/webengine/ui_delegates_manager.cpp
+++ b/src/webengine/ui_delegates_manager.cpp
@@ -58,9 +58,15 @@
//#define UI_DELEGATES_DEBUG
#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) \
case UIDelegatesManager::TYPE:\
return QStringLiteral(#TYPE".qml");
+#endif
static QString fileNameForComponent(UIDelegatesManager::ComponentType type)
{