diff options
| author | Alessandro Portale <alessandro.portale@nokia.com> | 2011-09-13 19:21:52 +0200 |
|---|---|---|
| committer | Alessandro Portale <alessandro.portale@nokia.com> | 2011-09-20 17:56:30 +0200 |
| commit | 768c4ef0824a009d2e37cf4d026e3079baf9e634 (patch) | |
| tree | 98a0835ffa7107f260b3396cb819595b970604ca /src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp | |
| parent | 5a76c4434e9e0d7adccfc9ac50b4238de9ce44d5 (diff) | |
| download | qt-creator-768c4ef0824a009d2e37cf4d026e3079baf9e634.tar.gz | |
Consistent names for AbstractGeneratedFileInfo::FileType keys
Change-Id: I619873dac7fe67209f9cc2128945cda080e2e6a0
Reviewed-on: http://codereview.qt-project.org/4828
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
Diffstat (limited to 'src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp')
| -rw-r--r-- | src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp b/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp index 8b24bae49d..e9f45f878e 100644 --- a/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp +++ b/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp @@ -207,10 +207,10 @@ QByteArray AbstractMobileApp::generateDesktopFile(QString *errorMessage, int fil QByteArray desktopFileContent; if (!readTemplate(DesktopOrigin, &desktopFileContent, errorMessage)) return QByteArray(); - if (fileType == AbstractGeneratedFileInfo::DesktopFileFremantle) { + if (fileType == AbstractGeneratedFileInfo::DesktopFremantleFile) { desktopFileContent.replace("Icon=thisApp", "Icon=" + projectName().toUtf8() + "64"); - } else if (fileType == AbstractGeneratedFileInfo::DesktopFileHarmattan) { + } else if (fileType == AbstractGeneratedFileInfo::DesktopHarmattanFile) { desktopFileContent.replace("Icon=thisApp", "Icon=/usr/share/icons/hicolor/80x80/apps/" + projectName().toUtf8() + "80.png"); if (m_supportsMeegoBooster) @@ -410,10 +410,10 @@ Core::GeneratedFiles AbstractMobileApp::generateFiles(QString *errorMessage) con files.last().setAttributes(Core::GeneratedFile::OpenProjectAttribute); files << file(generateFile(AbstractGeneratedFileInfo::MainCppFile, errorMessage), path(MainCpp)); files << file(generateFile(AbstractGeneratedFileInfo::SymbianSvgIconFile, errorMessage), path(SymbianSvgIcon)); - files << file(generateFile(AbstractGeneratedFileInfo::pngIconFile64, errorMessage), path(PngIcon64)); - files << file(generateFile(AbstractGeneratedFileInfo::pngIconFile80, errorMessage), path(PngIcon80)); - files << file(generateFile(AbstractGeneratedFileInfo::DesktopFileFremantle, errorMessage), path(DesktopFremantle)); - files << file(generateFile(AbstractGeneratedFileInfo::DesktopFileHarmattan, errorMessage), path(DesktopHarmattan)); + files << file(generateFile(AbstractGeneratedFileInfo::PngIcon64File, errorMessage), path(PngIcon64)); + files << file(generateFile(AbstractGeneratedFileInfo::PngIcon80File, errorMessage), path(PngIcon80)); + files << file(generateFile(AbstractGeneratedFileInfo::DesktopFremantleFile, errorMessage), path(DesktopFremantle)); + files << file(generateFile(AbstractGeneratedFileInfo::DesktopHarmattanFile, errorMessage), path(DesktopHarmattan)); return files; } #endif // CREATORLESSTEST @@ -465,14 +465,14 @@ QByteArray AbstractMobileApp::generateFile(int fileType, case AbstractGeneratedFileInfo::SymbianSvgIconFile: data = readBlob(path(SymbianSvgIconOrigin), errorMessage); break; - case AbstractGeneratedFileInfo::pngIconFile64: + case AbstractGeneratedFileInfo::PngIcon64File: data = readBlob(path(PngIconOrigin64), errorMessage); break; - case AbstractGeneratedFileInfo::pngIconFile80: + case AbstractGeneratedFileInfo::PngIcon80File: data = readBlob(path(PngIconOrigin80), errorMessage); break; - case AbstractGeneratedFileInfo::DesktopFileFremantle: - case AbstractGeneratedFileInfo::DesktopFileHarmattan: + case AbstractGeneratedFileInfo::DesktopFremantleFile: + case AbstractGeneratedFileInfo::DesktopHarmattanFile: data = generateDesktopFile(errorMessage, fileType); break; case AbstractGeneratedFileInfo::DeploymentPriFile: |