diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-01-23 17:11:03 +0100 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@digia.com> | 2013-01-24 08:57:14 +0100 |
| commit | 1bb0a7f174cb6175c1e61a64426951efe2c438b7 (patch) | |
| tree | c077ab86d8dc5ec9797bf2a32a8a7a84bd1d9ff1 | |
| parent | b53d398e2c15c1c31d9a3ca0104c936257466f2e (diff) | |
| download | qt-creator-1bb0a7f174cb6175c1e61a64426951efe2c438b7.tar.gz | |
Fix compilation with Qt 5.
Q_GLOBAL_STATIC_WITH_INITIALIZER was removed.
Change-Id: Ie030f2fa66c97ae1bfd8ede95c573453a7f03d2a
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
| -rw-r--r-- | src/plugins/qmlprojectmanager/qmlapp.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/plugins/qmlprojectmanager/qmlapp.cpp b/src/plugins/qmlprojectmanager/qmlapp.cpp index 566a5d8d0d..c777dbe9a1 100644 --- a/src/plugins/qmlprojectmanager/qmlapp.cpp +++ b/src/plugins/qmlprojectmanager/qmlapp.cpp @@ -42,11 +42,13 @@ namespace QmlProjectManager { namespace Internal { -Q_GLOBAL_STATIC_WITH_INITIALIZER(QStringList, binaryFiles, { - x->append(QLatin1String("png")); - x->append(QLatin1String("jpg")); - x->append(QLatin1String("jpeg")); -}) +static QStringList binaryFiles() +{ + static QStringList result; + if (result.isEmpty()) + result << QLatin1String("png") << QLatin1String("jpg") << QLatin1String("jpeg"); + return result; +} QString QmlApp::templateRootDirectory() { @@ -393,7 +395,7 @@ Core::GeneratedFiles QmlApp::generateFiles(QString *errorMessage) targetFileName = renameQmlFile(templateFile.fileName()); } - if (binaryFiles()->contains(templateFile.suffix())) { + if (binaryFiles().contains(templateFile.suffix())) { bool canAddBinaryFile = addBinaryFile(templateFile.absolutePath(), templateFile.fileName(), targetDirectory, |