Commit dd69bb67 authored by Friedemann Kleint's avatar Friedemann Kleint Committed by hjk
Browse files

Compile fix (QT_NO_CAST_FROM_ASCII).



Change-Id: Id43f23bdd70b7cbb30a0dc7a20f98508244135df
Reviewed-by: default avatarhjk <qthjk@ovi.com>
parent 36f6c02f
......@@ -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);
......
......@@ -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";
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment