From a0f4ce71e81dcf40e6c4c04f0fd87749ae71fd42 Mon Sep 17 00:00:00 2001 From: Artur Shepilko Date: Thu, 16 Jul 2020 14:23:14 -0500 Subject: [PATCH] Work around MSVC error initializing QString from const char * This deals with the error while compiling with MSVC 2017: fossilclient.cpp(398): error C2440: 'initializing': cannot convert from 'const char *' to 'QString' fossilclient.cpp(398): note: No constructor could take the source type, or constructor overload resolution was ambiguous No problem building that with gcc. Change-Id: Iddb9754cd5010505b182ca9b81e390a7c3b8fdda Reviewed-by: Orgad Shaneh --- plugins/fossil/fossilclient.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/fossil/fossilclient.cpp b/plugins/fossil/fossilclient.cpp index ead861da5e5..87fd407c6f3 100644 --- a/plugins/fossil/fossilclient.cpp +++ b/plugins/fossil/fossilclient.cpp @@ -393,7 +393,7 @@ RevisionInfo FossilClient::synchronousRevisionQuery(const QString &workingDirect QTC_ASSERT(idRx.isValid(), return RevisionInfo()); const QString hashToken = - (supportedFeatures().testFlag(InfoHashFeature) ? "hash: " : "uuid: "); + QString::fromUtf8(supportedFeatures().testFlag(InfoHashFeature) ? "hash: " : "uuid: "); for (const QString &l : output.split('\n', QString::SkipEmptyParts)) { if (l.startsWith("checkout: ", Qt::CaseInsensitive)