From c6419ff008bbf1afd2dfa4ed18a09de039cccef6 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Sun, 22 Mar 2009 13:47:57 +0100
Subject: [PATCH] less bizarre (and more efficient) argument list creation
---
.../qt4projectmanager/qtversionmanager.cpp | 30 ++++++++++---------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp
index 3621c06ac9e..702134aebda 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.cpp
+++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp
@@ -1116,20 +1116,22 @@ void QtVersion::updateVersionInfo() const
m_notInstalled = false;
QFileInfo qmake(qmakeCommand());
if (qmake.exists()) {
- QStringList variables = QStringList()
- << "QT_INSTALL_DATA"
- << "QT_INSTALL_LIBS"
- << "QT_INSTALL_HEADERS"
- << "QT_INSTALL_DEMOS"
- << "QT_INSTALL_EXAMPLES"
- << "QT_INSTALL_CONFIGURATION"
- << "QT_INSTALL_TRANSLATIONS"
- << "QT_INSTALL_PLUGINS"
- << "QT_INSTALL_BINS"
- << "QT_INSTALL_DOCS"
- << "QT_INSTALL_PREFIX";
- QStringList args = QStringList() << QString("-query")
- << variables.join(" -query ").split(" ", QString::SkipEmptyParts);
+ static const char * const variables[] = {
+ "QT_INSTALL_DATA",
+ "QT_INSTALL_LIBS",
+ "QT_INSTALL_HEADERS",
+ "QT_INSTALL_DEMOS",
+ "QT_INSTALL_EXAMPLES",
+ "QT_INSTALL_CONFIGURATION",
+ "QT_INSTALL_TRANSLATIONS",
+ "QT_INSTALL_PLUGINS",
+ "QT_INSTALL_BINS",
+ "QT_INSTALL_DOCS",
+ "QT_INSTALL_PREFIX"
+ };
+ QStringList args;
+ for (uint i = 0; i < sizeof variables / sizeof variables[0]; ++i)
+ args << "-query" << variables[i];
QProcess process;
process.start(qmake.absoluteFilePath(), args, QIODevice::ReadOnly);
if (process.waitForFinished(2000)) {
--
GitLab