From b6bd021a65e07e342672db41ec7007ee70ca32f3 Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Wed, 2 Dec 2009 15:26:21 +0100
Subject: [PATCH] Avoid some unnecessary byte array <-> string conversions.
Reviewed-by: dt
---
src/plugins/qt4projectmanager/qt-s60/s60devices.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devices.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devices.cpp
index 1b1497d28fc..dda6a2265d0 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devices.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devices.cpp
@@ -235,6 +235,9 @@ bool S60Devices::readWin()
bool S60Devices::detectQtForDevices()
{
+ // Do not normalize these backslashes since they are in ARM binaries:
+ const QByteArray indicator("\\src\\corelib\\kernel\\qobject.h");
+ const int indicatorlength = indicator.size();
for (int i = 0; i < m_devices.size(); ++i) {
if (!m_devices.at(i).qt.isEmpty())
continue;
@@ -243,14 +246,11 @@ bool S60Devices::detectQtForDevices()
m_devices[i].qt = QString();
continue;
}
- // Do not normalize these backslashes since they are in ARM binaries:
- const QString indicator("\\src\\corelib\\kernel\\qobject.h");
- int indicatorlength = indicator.length();
QByteArray buffer;
int index = -1;
while (!qtDll.atEnd()) {
buffer = qtDll.read(10000);
- index = buffer.indexOf(indicator.toLatin1());
+ index = buffer.indexOf(indicator);
if (index >= 0)
break;
if (!qtDll.atEnd())
--
GitLab