From dd69bb67f7d50d42a178f34920f9293be57d6480 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 24 Aug 2012 12:43:47 +0200 Subject: [PATCH] Compile fix (QT_NO_CAST_FROM_ASCII). Change-Id: Id43f23bdd70b7cbb30a0dc7a20f98508244135df Reviewed-by: hjk --- src/plugins/debugger/registerpostmortemaction.cpp | 2 +- src/shared/registryaccess/registryaccess.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/debugger/registerpostmortemaction.cpp b/src/plugins/debugger/registerpostmortemaction.cpp index bc1574574b2..daa93e0b938 100644 --- a/src/plugins/debugger/registerpostmortemaction.cpp +++ b/src/plugins/debugger/registerpostmortemaction.cpp @@ -53,7 +53,7 @@ void RegisterPostMortemAction::registerNow(const QVariant &value) { const bool boolValue = value.toBool(); const QString debuggerExe = QDir::toNativeSeparators(QCoreApplication::applicationDirPath() + QLatin1Char('/') - + debuggerApplicationFileC + QLatin1String(".exe")); + + QLatin1String(debuggerApplicationFileC) + QLatin1String(".exe")); const ushort *debuggerWString = debuggerExe.utf16(); CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE); diff --git a/src/shared/registryaccess/registryaccess.cpp b/src/shared/registryaccess/registryaccess.cpp index 3d67bf4caa3..e0131ab263e 100644 --- a/src/shared/registryaccess/registryaccess.cpp +++ b/src/shared/registryaccess/registryaccess.cpp @@ -114,7 +114,7 @@ bool openRegistryKey(HKEY category, // HKEY_LOCAL_MACHINE, etc. if (rc != ERROR_SUCCESS) { *errorMessage = msgFunctionFailed("RegOpenKeyEx", rc); if (readWrite) - *errorMessage += "You need administrator privileges to edit the registry."; + *errorMessage += QLatin1String("You need administrator privileges to edit the registry."); return false; } return true; @@ -128,7 +128,7 @@ QString debuggerCall(const QString &additionalOption) QString rc; QTextStream str(&rc); str << '"' << QDir::toNativeSeparators(QApplication::applicationDirPath() + QLatin1Char('/') - + debuggerApplicationFileC + QLatin1String(".exe")) << '"'; + + QLatin1String(debuggerApplicationFileC) + QLatin1String(".exe")) << '"'; if (!additionalOption.isEmpty()) str << ' ' << additionalOption; str << " %ld %ld";