feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix compilation with Qt 5.

Browse Source 
Q_GLOBAL_STATIC_WITH_INITIALIZER was removed.

Change-Id: Ie030f2fa66c97ae1bfd8ede95c573453a7f03d2a
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
This commit is contained in:
Friedemann Kleint
2013-01-23 17:11:03 +01:00
committed by Kai Koehne
parent b53d398e2c
commit 1bb0a7f174
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/qmlprojectmanager/qmlapp.cpp
View File

@@ -42,11 +42,13 @@
namespace QmlProjectManager { namespace QmlProjectManager {
namespace Internal { namespace Internal {
Q_GLOBAL_STATIC_WITH_INITIALIZER(QStringList, binaryFiles, { static QStringList binaryFiles()
x->append(QLatin1String("png")); {
x->append(QLatin1String("jpg")); static QStringList result;
x->append(QLatin1String("jpeg")); if (result.isEmpty())
}) result << QLatin1String("png") << QLatin1String("jpg") << QLatin1String("jpeg");
return result;
}
QString QmlApp::templateRootDirectory() QString QmlApp::templateRootDirectory()
{ {
@@ -393,7 +395,7 @@ Core::GeneratedFiles QmlApp::generateFiles(QString *errorMessage)
targetFileName = renameQmlFile(templateFile.fileName()); targetFileName = renameQmlFile(templateFile.fileName());
} }
if (binaryFiles()->contains(templateFile.suffix())) { if (binaryFiles().contains(templateFile.suffix())) {
bool canAddBinaryFile = addBinaryFile(templateFile.absolutePath(), bool canAddBinaryFile = addBinaryFile(templateFile.absolutePath(),
templateFile.fileName(), templateFile.fileName(),
targetDirectory, targetDirectory,