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

Compile fixes.

Browse Source 
Reviewed-by: Oswald Buddenhagen
This commit is contained in:
Robert Loehning
2010-02-05 16:20:33 +01:00
parent 27fa4c0440
commit a5252a4463
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/debugger/cdb/cdbbreakpoint.cpp
View File

@@ -97,7 +97,7 @@ bool synchronizeBreakPoints(CIDebugControl* debugControl,
updateMarkers = true; updateMarkers = true;
nbd->pending = false; nbd->pending = false;
nbd->bpNumber = QByteArray::number(uint(id)); nbd->bpNumber = QByteArray::number(uint(id));
nbd->bpAddress = QLatin1String("0x") + QString::number(address, 16); nbd->bpAddress = "0x" + QByteArray::number(address, 16);
// Take over rest as is // Take over rest as is
nbd->bpCondition = nbd->condition; nbd->bpCondition = nbd->condition;
nbd->bpIgnoreCount = nbd->ignoreCount; nbd->bpIgnoreCount = nbd->ignoreCount;

3
src/shared/proparser/profileevaluator.cpp
View File

@@ -2735,12 +2735,13 @@ QStringList ProFileEvaluator::Private::values(const QString &variableName,
break; break;
#if defined(Q_OS_WIN32) #if defined(Q_OS_WIN32)
case V_QMAKE_HOST_os: ret = QLatin1String("Windows"); break; case V_QMAKE_HOST_os: ret = QLatin1String("Windows"); break;
case V_QMAKE_HOST_name: case V_QMAKE_HOST_name: {
DWORD name_length = 1024; DWORD name_length = 1024;
TCHAR name[1024]; TCHAR name[1024];
if (GetComputerName(name, &name_length)) if (GetComputerName(name, &name_length))
ret = QString::fromUtf16((ushort*)name, name_length); ret = QString::fromUtf16((ushort*)name, name_length);
break; break;
}
case V_QMAKE_HOST_version: case V_QMAKE_HOST_version:
ret = QString::number(QSysInfo::WindowsVersion); ret = QString::number(QSysInfo::WindowsVersion);
break; break;