From 4e564135eff452cc3156d0862b1f1a0ddb8a4f65 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Thu, 24 Mar 2011 14:15:00 +0100 Subject: [PATCH] RVCT: Speed up detection of version Speed up detection of version information of RVCT. This is especially relevant for people with wrong license server information as that causes creator to wait for a timeout! Reviewed-by: dt --- src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp b/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp index cd5cd2ba96..a29485bbcb 100644 --- a/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp @@ -114,7 +114,7 @@ RvctToolChain::RvctVersion RvctToolChain::version(const QString &rvctPath) QProcess armcc; const QString binary = rvctPath; - armcc.start(binary, QStringList()); + armcc.start(binary, QStringList() << "--version_number"); if (!armcc.waitForStarted()) { qWarning("Unable to run rvct binary '%s' when trying to determine version.", qPrintable(binary)); return v; @@ -131,7 +131,7 @@ RvctToolChain::RvctVersion RvctToolChain::version(const QString &rvctPath) } QString versionLine = QString::fromLocal8Bit(armcc.readAllStandardOutput()); versionLine += QString::fromLocal8Bit(armcc.readAllStandardError()); - const QRegExp versionRegExp(QLatin1String("RVCT(\\d*)\\.(\\d*).*\\[Build.(\\d*)\\]"), + const QRegExp versionRegExp(QLatin1String("^(\\d)(\\d)0*([1-9]\\d*)"), Qt::CaseInsensitive); Q_ASSERT(versionRegExp.isValid()); -- 2.11.0