diff options
| author | Artur Shepilko <artur.shepilko@nomadbyte.com> | 2020-07-16 14:23:14 -0500 |
|---|---|---|
| committer | Artur Shepilko <artur.shepilko@nomadbyte.com> | 2020-07-19 05:15:02 +0000 |
| commit | 69f3f359d7304db432c137784d3f17a8fb1d37ec (patch) | |
| tree | e03754cbbebf38dcc648511a11bb1025c8443585 | |
| parent | eedbcde445c4bd006480297fd6f99e592e297e01 (diff) | |
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 <orgads@gmail.com>
(cherry picked from commit a0f4ce71e81dcf40e6c4c04f0fd87749ae71fd42)
| -rw-r--r-- | plugins/fossil/fossilclient.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/fossil/fossilclient.cpp b/plugins/fossil/fossilclient.cpp index 2a01aa2..b95a48e 100644 --- a/plugins/fossil/fossilclient.cpp +++ b/plugins/fossil/fossilclient.cpp @@ -394,7 +394,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', Utils::SkipEmptyParts)) { if (l.startsWith("checkout: ", Qt::CaseInsensitive) |