From a5252a446346be2628827088e7d7e83d24c4e8f5 Mon Sep 17 00:00:00 2001
From: Robert Loehning <robert.loehning@nokia.com>
Date: Fri, 5 Feb 2010 16:20:33 +0100
Subject: [PATCH] Compile fixes.
Reviewed-by: Oswald Buddenhagen
---
src/plugins/debugger/cdb/cdbbreakpoint.cpp | 2 +-
src/shared/proparser/profileevaluator.cpp | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/plugins/debugger/cdb/cdbbreakpoint.cpp b/src/plugins/debugger/cdb/cdbbreakpoint.cpp
index 032222a3cb9..be605645ab1 100644
--- a/src/plugins/debugger/cdb/cdbbreakpoint.cpp
+++ b/src/plugins/debugger/cdb/cdbbreakpoint.cpp
@@ -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;
diff --git a/src/shared/proparser/profileevaluator.cpp b/src/shared/proparser/profileevaluator.cpp
index cd6cc984a1f..caeb71b1901 100644
--- a/src/shared/proparser/profileevaluator.cpp
+++ b/src/shared/proparser/profileevaluator.cpp
@@ -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;
--
GitLab