Use Q_GLOBAL_STATIC{_WITH_ARGS} following Qt coding conventions.

Move the regexp into its own compilation unit, so we get it only
once and use a accessor to fetch the value. I guess we should do
the same with the constants file, as all strings get compiled in
the file including it. At least Ossi wasn't satisfied currently.

Change-Id: Ic495a82f4b3cfe7810523b12cd3ef255eb15f149
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>

1 files changed, 2 insertions, 1 deletions

diff --git a/tools/common/repositorygen.cpp b/tools/common/repositorygen.cpp
index 5bd95a0e3..fdad96871 100644
--- a/tools/common/repositorygen.cpp
+++ b/tools/common/repositorygen.cpp
@@ -42,6 +42,7 @@
 
 #include <fileutils.h>
 #include <errors.h>
+#include <globals.h>
 #include <lib7z_facade.h>
 #include <settings.h>
 #include <qinstallerglobal.h>
@@ -508,7 +509,7 @@ PackageInfoVector QInstallerTools::createListOfPackages(const QString &packagesD
                 .arg(fileInfo.absoluteFilePath(), info.version));
         }
         info.dependencies = packageElement.firstChildElement(QLatin1String("Dependencies")).text()
-            .split(QInstaller::scCommaRegExp, QString::SkipEmptyParts);
+            .split(QInstaller::commaRegExp(), QString::SkipEmptyParts);
         info.directory = it->filePath();
         dict.push_back(info);