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

Compile fix (QT_NO_CAST_FROM_ASCII).

Browse Source 
Change-Id: Id43f23bdd70b7cbb30a0dc7a20f98508244135df
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Friedemann Kleint
2012-08-24 12:43:47 +02:00
committed by hjk
parent 36f6c02f1c
commit dd69bb67f7
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/debugger/registerpostmortemaction.cpp
View File

@@ -53,7 +53,7 @@ void RegisterPostMortemAction::registerNow(const QVariant &value)
{ {
const bool boolValue = value.toBool(); const bool boolValue = value.toBool();
const QString debuggerExe = QDir::toNativeSeparators(QCoreApplication::applicationDirPath() + QLatin1Char('/') const QString debuggerExe = QDir::toNativeSeparators(QCoreApplication::applicationDirPath() + QLatin1Char('/')
+ debuggerApplicationFileC + QLatin1String(".exe")); + QLatin1String(debuggerApplicationFileC) + QLatin1String(".exe"));
const ushort *debuggerWString = debuggerExe.utf16(); const ushort *debuggerWString = debuggerExe.utf16();
CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE); CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE);

4
src/shared/registryaccess/registryaccess.cpp
View File

@@ -114,7 +114,7 @@ bool openRegistryKey(HKEY category, // HKEY_LOCAL_MACHINE, etc.
if (rc != ERROR_SUCCESS) { if (rc != ERROR_SUCCESS) {
*errorMessage = msgFunctionFailed("RegOpenKeyEx", rc); *errorMessage = msgFunctionFailed("RegOpenKeyEx", rc);
if (readWrite) if (readWrite)
*errorMessage += "You need administrator privileges to edit the registry."; *errorMessage += QLatin1String("You need administrator privileges to edit the registry.");
return false; return false;
} }
return true; return true;
@@ -128,7 +128,7 @@ QString debuggerCall(const QString &additionalOption)
QString rc; QString rc;
QTextStream str(&rc); QTextStream str(&rc);
str << '"' << QDir::toNativeSeparators(QApplication::applicationDirPath() + QLatin1Char('/') str << '"' << QDir::toNativeSeparators(QApplication::applicationDirPath() + QLatin1Char('/')
+ debuggerApplicationFileC + QLatin1String(".exe")) << '"'; + QLatin1String(debuggerApplicationFileC) + QLatin1String(".exe")) << '"';
if (!additionalOption.isEmpty()) if (!additionalOption.isEmpty())
str << ' ' << additionalOption; str << ' ' << additionalOption;
str << " %ld %ld"; str << " %ld %ld";