From 98ac42c78dc9118eacf85f9f817b7d287d9ff02d Mon Sep 17 00:00:00 2001
From: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Date: Thu, 6 Feb 2014 22:55:41 +0100
Subject: [PATCH] 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>
---
src/webengine/ui_delegates_manager.cpp | 6 ++++++
1 file changed, 6 insertions(+)
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)
{
--
GitLab