diff options
| author | Andre Hartmann <[email protected]> | 2025-05-11 06:49:36 +0200 |
|---|---|---|
| committer | André Hartmann <[email protected]> | 2025-05-11 08:02:18 +0000 |
| commit | fc8ce74f8aa781a9f996814abd29b5164e311c4a (patch) | |
| tree | 704067fd337a35d79844d63289053b577434b893 /src | |
| parent | a56d15d7d2228124700cd90e7e0c135d9a978a99 (diff) | |
VCS: Fix ClearCase and Subversion MSVC compiling
clearcaseplugin.cpp(111): error C2445: result type of conditional
expression is ambiguous: types 'const QByteArray' and 'const char [11]'
can be converted to multiple common types
clearcaseplugin.cpp(111): note: could be 'const QByteArray'
clearcaseplugin.cpp(111): note: or 'const char *'
clearcaseplugin.cpp(2280): error C2445: result type of conditional
expression is ambiguous: types 'const char [6]' and 'const QByteArray'
can be converted to multiple common types
clearcaseplugin.cpp(2280): note: could be 'const char *'
clearcaseplugin.cpp(2280): note: or 'const QByteArray'
subversionplugin.cpp(90): error C2445: result type of conditional
expression is ambiguous: types 'const QByteArray' and 'const char [11]'
can be converted to multiple common types
subversionplugin.cpp(90): note: could be 'const QByteArray'
subversionplugin.cpp(90): note: or 'const char *'
Amends 3704221bf2cba1305279b77a00ea43f010ed179b
Change-Id: Ibc6c92a18bfa8b44a1e23bdb677488593b28389f
Reviewed-by: Orgad Shaneh <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/clearcase/clearcaseplugin.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/subversion/subversionplugin.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/clearcase/clearcaseplugin.cpp b/src/plugins/clearcase/clearcaseplugin.cpp index c3b5b4767ee..1bb1573fd48 100644 --- a/src/plugins/clearcase/clearcaseplugin.cpp +++ b/src/plugins/clearcase/clearcaseplugin.cpp @@ -108,7 +108,7 @@ const char DIFF_EDITOR_ID[] = "ClearCase Diff Editor"; static QByteArray debugCodec(const QByteArray &c) { - return !c.isEmpty() ? c : "Null codec"; + return !c.isEmpty() ? c : QByteArray("Null codec"); } class ClearCasePluginPrivate final : public VcsBase::VersionControlBase @@ -2277,7 +2277,7 @@ QString ClearCasePluginPrivate::runExtDiff(const FilePath &workingDir, const QSt { Process process; process.setWorkingDirectory(workingDir); - process.setCodec(outputCodec.isEmpty() ? "UTF-8" : outputCodec); + process.setCodec(outputCodec.isEmpty() ? QByteArray("UTF-8") : outputCodec); process.setCommand({"diff", {m_settings.diffArgs.split(' ', Qt::SkipEmptyParts), arguments}}); process.runBlocking(seconds(timeOutS), EventLoopMode::On); if (process.result() != ProcessResult::FinishedWithSuccess) diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp index 25ad00bdee7..0bbc5208f8d 100644 --- a/src/plugins/subversion/subversionplugin.cpp +++ b/src/plugins/subversion/subversionplugin.cpp @@ -87,7 +87,7 @@ const char CMD_ID_DESCRIBE[] = "Subversion.Describe"; static QByteArray debugCodec(const QByteArray &c) { - return !c.isEmpty() ? c : "Null codec"; + return !c.isEmpty() ? c : QByteArray("Null codec"); } // Parse "svn status" output for added/conflicted/deleted/modified files |