From 236ce87696912defd43820b1ecbdd96119fc82f4 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Tue, 29 Nov 2016 16:29:29 +0000 Subject: [PATCH] Revert "Qmake: Remove some QLatin1Strings" Does not build with all supported compilers. Sorry. This reverts commit c0fdb14a9408843bd76e26bb7e093b5769f9cd83. Change-Id: Iac2cde27b8b4eb208c9bbbd38f63877e77ff3eb5 Reviewed-by: Tim Jenssen --- src/plugins/qmakeprojectmanager/externaleditors.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/qmakeprojectmanager/externaleditors.cpp b/src/plugins/qmakeprojectmanager/externaleditors.cpp index 096d605365b..0b067e7a09b 100644 --- a/src/plugins/qmakeprojectmanager/externaleditors.cpp +++ b/src/plugins/qmakeprojectmanager/externaleditors.cpp @@ -66,14 +66,14 @@ static QString linguistBinary(const QtSupport::BaseQtVersion *qtVersion) { if (qtVersion) return qtVersion->linguistCommand(); - return Utils::HostOsInfo::isMacHost() ? "Linguist" : "linguist"; + return QLatin1String(Utils::HostOsInfo::isMacHost() ? "Linguist" : "linguist"); } static QString designerBinary(const QtSupport::BaseQtVersion *qtVersion) { if (qtVersion) 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 ' to