feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Revert "Qmake: Remove some QLatin1Strings"

Browse Source 
Does not build with all supported compilers. Sorry.

This reverts commit c0fdb14a94.

Change-Id: Iac2cde27b8b4eb208c9bbbd38f63877e77ff3eb5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2016-11-29 16:29:29 +00:00
committed by Tim Jenssen
parent 63b80ee080
commit 236ce87696
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmakeprojectmanager/externaleditors.cpp
View File

@@ -66,14 +66,14 @@ static QString linguistBinary(const QtSupport::BaseQtVersion *qtVersion)
{ {
if (qtVersion) if (qtVersion)
return qtVersion->linguistCommand(); return qtVersion->linguistCommand();
return Utils::HostOsInfo::isMacHost() ? "Linguist" : "linguist"; return QLatin1String(Utils::HostOsInfo::isMacHost() ? "Linguist" : "linguist");
} }
static QString designerBinary(const QtSupport::BaseQtVersion *qtVersion) static QString designerBinary(const QtSupport::BaseQtVersion *qtVersion)
{ {
if (qtVersion) if (qtVersion)
return qtVersion->designerCommand(); return qtVersion->designerCommand();
return Utils::HostOsInfo::isMacHost() ? "Designer" : "designer"; return QLatin1String(Utils::HostOsInfo::isMacHost() ? "Designer" : "designer");
} }
// Mac: Change the call 'Foo.app/Contents/MacOS/Foo <filelist>' to // Mac: Change the call 'Foo.app/Contents/MacOS/Foo <filelist>' to