Commit a5252a44 authored by Robert Loehning's avatar Robert Loehning
Browse files

Compile fixes.

Reviewed-by: Oswald Buddenhagen
parent 27fa4c04
......@@ -97,7 +97,7 @@ bool synchronizeBreakPoints(CIDebugControl* debugControl,
updateMarkers = true;
nbd->pending = false;
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
nbd->bpCondition = nbd->condition;
nbd->bpIgnoreCount = nbd->ignoreCount;
......
......@@ -2735,12 +2735,13 @@ QStringList ProFileEvaluator::Private::values(const QString &variableName,
break;
#if defined(Q_OS_WIN32)
case V_QMAKE_HOST_os: ret = QLatin1String("Windows"); break;
case V_QMAKE_HOST_name:
case V_QMAKE_HOST_name: {
DWORD name_length = 1024;
TCHAR name[1024];
if (GetComputerName(name, &name_length))
ret = QString::fromUtf16((ushort*)name, name_length);
break;
}
case V_QMAKE_HOST_version:
ret = QString::number(QSysInfo::WindowsVersion);
break;
......
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