diff options
Diffstat (limited to 'src/plugins/qmlprojectmanager/qmlapp.cpp')
| -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, |