From 03c0060b960bb6e4c75540d69bbedf1ce7a3a1e1 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Mon, 13 Sep 2010 17:52:16 +0200 Subject: [PATCH] Mobile + QML wizard: Share common resources. Reviewed-by: Alessandro Portale --- share/qtcreator/templates/qmlapp/app.desktop | 11 --- .../qtcreator/templates/qmlapp/maemoicon.png | Bin 3400 -> 0 bytes .../templates/qmlapp/symbianicon.svg | 93 ------------------ .../{mobileapp => shared}/app.desktop | 0 .../{mobileapp => shared}/maemoicon.png | Bin .../{mobileapp => shared}/symbianicon.svg | 0 .../qt4projectmanager/wizards/mobileapp.cpp | 26 ++--- .../qt4projectmanager/wizards/mobileapp.h | 2 +- .../wizards/mobileguiappwizard.cpp | 54 ---------- .../wizards/mobileguiappwizard.h | 49 --------- .../wizards/qmlstandaloneapp.cpp | 28 +++--- .../wizards/qmlstandaloneapp.h | 2 +- 12 files changed, 31 insertions(+), 234 deletions(-) delete mode 100644 share/qtcreator/templates/qmlapp/app.desktop delete mode 100644 share/qtcreator/templates/qmlapp/maemoicon.png delete mode 100644 share/qtcreator/templates/qmlapp/symbianicon.svg rename share/qtcreator/templates/{mobileapp => shared}/app.desktop (100%) rename share/qtcreator/templates/{mobileapp => shared}/maemoicon.png (100%) rename share/qtcreator/templates/{mobileapp => shared}/symbianicon.svg (100%) delete mode 100644 src/plugins/qt4projectmanager/wizards/mobileguiappwizard.cpp delete mode 100644 src/plugins/qt4projectmanager/wizards/mobileguiappwizard.h diff --git a/share/qtcreator/templates/qmlapp/app.desktop b/share/qtcreator/templates/qmlapp/app.desktop deleted file mode 100644 index e9d9304f6be..00000000000 --- a/share/qtcreator/templates/qmlapp/app.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Type=Application -Terminal=false -Name=thisApp -Exec=/opt/bin/thisApp -Icon=thisApp -X-Window-Icon= -X-HildonDesk-ShowInToolbar=true -X-Osso-Type=application/x-executable diff --git a/share/qtcreator/templates/qmlapp/maemoicon.png b/share/qtcreator/templates/qmlapp/maemoicon.png deleted file mode 100644 index 707d5c4e85d82959740b243a8a36d5071c277299..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3400 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 diff --git a/share/qtcreator/templates/qmlapp/symbianicon.svg b/share/qtcreator/templates/qmlapp/symbianicon.svg deleted file mode 100644 index 566acfada01..00000000000 --- a/share/qtcreator/templates/qmlapp/symbianicon.svg +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - diff --git a/share/qtcreator/templates/mobileapp/app.desktop b/share/qtcreator/templates/shared/app.desktop similarity index 100% rename from share/qtcreator/templates/mobileapp/app.desktop rename to share/qtcreator/templates/shared/app.desktop diff --git a/share/qtcreator/templates/mobileapp/maemoicon.png b/share/qtcreator/templates/shared/maemoicon.png similarity index 100% rename from share/qtcreator/templates/mobileapp/maemoicon.png rename to share/qtcreator/templates/shared/maemoicon.png diff --git a/share/qtcreator/templates/mobileapp/symbianicon.svg b/share/qtcreator/templates/shared/symbianicon.svg similarity index 100% rename from share/qtcreator/templates/mobileapp/symbianicon.svg rename to share/qtcreator/templates/shared/symbianicon.svg diff --git a/src/plugins/qt4projectmanager/wizards/mobileapp.cpp b/src/plugins/qt4projectmanager/wizards/mobileapp.cpp index 1634e1384d0..887fa9b2f28 100644 --- a/src/plugins/qt4projectmanager/wizards/mobileapp.cpp +++ b/src/plugins/qt4projectmanager/wizards/mobileapp.cpp @@ -159,7 +159,8 @@ bool MobileApp::networkEnabled() const QString MobileApp::path(Path path) const { - const QString originsRoot = templatesRoot(); + const QString originsRootMobileApp = templatesRoot(QLatin1String("mobileapp/")); + const QString originsRootShared = templatesRoot(QLatin1String("shared/")); const QString mainCppFileName = QLatin1String("main.cpp"); const QString symbianIconFileName = QLatin1String("symbianicon.svg"); const QString pathBase = m_projectPath.absoluteFilePath() + QLatin1Char('/') @@ -167,26 +168,26 @@ QString MobileApp::path(Path path) const switch (path) { case MainCpp: return pathBase + mainCppFileName; - case MainCppOrigin: return originsRoot + mainCppFileName; + case MainCppOrigin: return originsRootMobileApp + mainCppFileName; case AppPro: return pathBase + m_projectName + QLatin1String(".pro"); - case AppProOrigin: return originsRoot + QLatin1String("app.pro"); + case AppProOrigin: return originsRootMobileApp + QLatin1String("app.pro"); case AppProPath: return pathBase; case AppPri: return pathBase + m_projectName + QLatin1String(".pri"); - case AppPriOrigin: return originsRoot + QLatin1String("app.pri"); + case AppPriOrigin: return originsRootMobileApp + QLatin1String("app.pri"); case Desktop: return pathBase + m_projectName + QLatin1String(".desktop"); - case DesktopOrigin: return originsRoot + QLatin1String("app.desktop"); + case DesktopOrigin: return originsRootShared + QLatin1String("app.desktop"); case MainWindowCpp: return pathBase + mainWindowCppFileName; - case MainWindowCppOrigin: return originsRoot + mainWindowCppFileName; + case MainWindowCppOrigin: return originsRootMobileApp + mainWindowCppFileName; case MainWindowH: return pathBase + mainWindowHFileName; - case MainWindowHOrigin: return originsRoot + mainWindowHFileName; + case MainWindowHOrigin: return originsRootMobileApp + mainWindowHFileName; case MainWindowUi: return pathBase + mainWindowUiFileName; - case MainWindowUiOrigin: return originsRoot + mainWindowUiFileName; + case MainWindowUiOrigin: return originsRootMobileApp + mainWindowUiFileName; case SymbianSvgIcon: return pathBase + symbianIconFileName; case SymbianSvgIconOrigin: return !m_symbianSvgIcon.isEmpty() ? m_symbianSvgIcon - : originsRoot + symbianIconFileName; + : originsRootShared + symbianIconFileName; case MaemoPngIcon: return pathBase + projectName() + QLatin1String(".png"); case MaemoPngIconOrigin: return !m_maemoPngIcon.isEmpty() ? m_maemoPngIcon - : originsRoot + QLatin1String("maemoicon.png"); + : originsRootShared + QLatin1String("maemoicon.png"); default: qFatal("MobileApp::path() needs more work"); } return QString(); @@ -297,9 +298,10 @@ QByteArray MobileApp::generateDesktopFile(const QString *errorMessage) const return desktopFileContent.replace("thisApp", projectName().toUtf8()); } -QString MobileApp::templatesRoot() +QString MobileApp::templatesRoot(const QString &dirName) { - return Core::ICore::instance()->resourcePath() + QLatin1String("/templates/mobileapp/"); + return Core::ICore::instance()->resourcePath() + + QLatin1String("/templates/") + dirName; } static Core::GeneratedFile file(const QByteArray &data, const QString &targetFile) diff --git a/src/plugins/qt4projectmanager/wizards/mobileapp.h b/src/plugins/qt4projectmanager/wizards/mobileapp.h index 9452bc361f7..1094f48406c 100644 --- a/src/plugins/qt4projectmanager/wizards/mobileapp.h +++ b/src/plugins/qt4projectmanager/wizards/mobileapp.h @@ -125,7 +125,7 @@ private: QByteArray generateMainCpp(const QString *errorMessage) const; QByteArray generateProFile(const QString *errorMessage) const; QByteArray generateDesktopFile(const QString *errorMessage) const; - static QString templatesRoot(); + static QString templatesRoot(const QString &dirName); QString m_projectName; QFileInfo m_projectPath; diff --git a/src/plugins/qt4projectmanager/wizards/mobileguiappwizard.cpp b/src/plugins/qt4projectmanager/wizards/mobileguiappwizard.cpp deleted file mode 100644 index 12f6aceecac..00000000000 --- a/src/plugins/qt4projectmanager/wizards/mobileguiappwizard.cpp +++ /dev/null @@ -1,54 +0,0 @@ -/************************************************************************** -** -** This file is part of Qt Creator -** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** Commercial Usage -** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. -** -** GNU Lesser General Public License Usage -** -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. -** -**************************************************************************/ - -#include "mobileguiappwizard.h" - -#include "qt4projectmanagerconstants.h" - -#include - -namespace Qt4ProjectManager { -namespace Internal { - -MobileGuiAppWizard::MobileGuiAppWizard() : - GuiAppWizard(QLatin1String("C.Qt4GuiMobile"), - QLatin1String(Constants::QT_APP_WIZARD_CATEGORY), - QLatin1String(Constants::QT_APP_WIZARD_TR_SCOPE), - QLatin1String(Constants::QT_APP_WIZARD_TR_CATEGORY), - tr("Mobile Qt Application"), - tr("Creates a Qt application optimized for mobile devices " - "with a Qt Designer-based main window.\n\n" - "Preselects Qt for Simulator and mobile targets if available."), - QIcon(QLatin1String(":/projectexplorer/images/SymbianDevice.png")), - true) -{ -} - -} // namespace Internal -} // namespace Qt4ProjectManager diff --git a/src/plugins/qt4projectmanager/wizards/mobileguiappwizard.h b/src/plugins/qt4projectmanager/wizards/mobileguiappwizard.h deleted file mode 100644 index 0ab1711d541..00000000000 --- a/src/plugins/qt4projectmanager/wizards/mobileguiappwizard.h +++ /dev/null @@ -1,49 +0,0 @@ -/************************************************************************** -** -** This file is part of Qt Creator -** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** Commercial Usage -** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. -** -** GNU Lesser General Public License Usage -** -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. -** -**************************************************************************/ - -#ifndef MOBILEGUIAPPWIZARD_H -#define MOBILEGUIAPPWIZARD_H - -#include "guiappwizard.h" - -namespace Qt4ProjectManager { -namespace Internal { - -class MobileGuiAppWizard : public GuiAppWizard -{ - Q_OBJECT - -public: - MobileGuiAppWizard(); -}; - -} // namespace Internal -} // namespace Qt4ProjectManager - -#endif // GUIAPPWIZARD_H diff --git a/src/plugins/qt4projectmanager/wizards/qmlstandaloneapp.cpp b/src/plugins/qt4projectmanager/wizards/qmlstandaloneapp.cpp index 12cfa12b1a2..710572ded31 100644 --- a/src/plugins/qt4projectmanager/wizards/qmlstandaloneapp.cpp +++ b/src/plugins/qt4projectmanager/wizards/qmlstandaloneapp.cpp @@ -272,8 +272,9 @@ QString QmlStandaloneApp::path(Path path) const { const QString qmlSubDir = QLatin1String("qml/") + (useExistingMainQml() ? m_mainQmlFile.dir().dirName() : m_projectName) - + QLatin1Char('/'); - const QString originsRoot = templatesRoot(); + + QLatin1Char('/'); + const QString originsRootQmlApp = templatesRoot(QLatin1String("qmlapp/")); + const QString originsRootShared = templatesRoot(QLatin1String("shared/")); const QString appViewerTargetSubDir = appViewerOriginsSubDir; const QString qmlExtension = QLatin1String(".qml"); const QString mainCppFileName = QLatin1String("main.cpp"); @@ -287,26 +288,26 @@ QString QmlStandaloneApp::path(Path path) const : pathBase + qmlSubDir + m_projectName + qmlExtension; case MainQmlDeployed: return useExistingMainQml() ? qmlSubDir + m_mainQmlFile.fileName() : QString(qmlSubDir + m_projectName + qmlExtension); - case MainQmlOrigin: return originsRoot + QLatin1String("qml/app/app.qml"); + case MainQmlOrigin: return originsRootQmlApp + QLatin1String("qml/app/app.qml"); case MainCpp: return pathBase + mainCppFileName; - case MainCppOrigin: return originsRoot + mainCppFileName; + case MainCppOrigin: return originsRootQmlApp + mainCppFileName; case AppPro: return pathBase + m_projectName + QLatin1String(".pro"); - case AppProOrigin: return originsRoot + QLatin1String("app.pro"); + case AppProOrigin: return originsRootQmlApp + QLatin1String("app.pro"); case AppProPath: return pathBase; case Desktop: return pathBase + m_projectName + QLatin1String(".desktop"); - case DesktopOrigin: return originsRoot + QLatin1String("app.desktop"); + case DesktopOrigin: return originsRootShared + QLatin1String("app.desktop"); case AppViewerPri: return pathBase + appViewerTargetSubDir + appViewerPriFileName; - case AppViewerPriOrigin: return originsRoot + appViewerOriginsSubDir + appViewerPriFileName; + case AppViewerPriOrigin: return originsRootQmlApp + appViewerOriginsSubDir + appViewerPriFileName; case AppViewerCpp: return pathBase + appViewerTargetSubDir + appViewerCppFileName; - case AppViewerCppOrigin: return originsRoot + appViewerOriginsSubDir + appViewerCppFileName; + case AppViewerCppOrigin: return originsRootQmlApp + appViewerOriginsSubDir + appViewerCppFileName; case AppViewerH: return pathBase + appViewerTargetSubDir + appViewerHFileName; - case AppViewerHOrigin: return originsRoot + appViewerOriginsSubDir + appViewerHFileName; + case AppViewerHOrigin: return originsRootQmlApp + appViewerOriginsSubDir + appViewerHFileName; case SymbianSvgIcon: return pathBase + symbianIconFileName; case SymbianSvgIconOrigin: return !m_symbianSvgIcon.isEmpty() ? m_symbianSvgIcon - : originsRoot + symbianIconFileName; + : originsRootShared + symbianIconFileName; case MaemoPngIcon: return pathBase + projectName() + QLatin1String(".png"); case MaemoPngIconOrigin: return !m_maemoPngIcon.isEmpty() ? m_maemoPngIcon - : originsRoot + QLatin1String("maemoicon.png"); + : originsRootShared + QLatin1String("maemoicon.png"); case QmlDir: return pathBase + qmlSubDir; case QmlDirProFileRelative: return useExistingMainQml() ? appProFilePath.relativeFilePath(m_mainQmlFile.canonicalPath()) : QString(qmlSubDir).remove(qmlSubDir.length() - 1, 1); @@ -533,9 +534,10 @@ bool QmlStandaloneApp::addExternalModule(const QString &name, const QFileInfo &d } #ifndef CREATORLESSTEST -QString QmlStandaloneApp::templatesRoot() +QString QmlStandaloneApp::templatesRoot(const QString &dirName) { - return Core::ICore::instance()->resourcePath() + QLatin1String("/templates/qmlapp/"); + return Core::ICore::instance()->resourcePath() + + QLatin1String("/templates/") + dirName; } static Core::GeneratedFile file(const QByteArray &data, const QString &targetFile) diff --git a/src/plugins/qt4projectmanager/wizards/qmlstandaloneapp.h b/src/plugins/qt4projectmanager/wizards/qmlstandaloneapp.h index 03deb386c21..83627fe429a 100644 --- a/src/plugins/qt4projectmanager/wizards/qmlstandaloneapp.h +++ b/src/plugins/qt4projectmanager/wizards/qmlstandaloneapp.h @@ -179,7 +179,7 @@ private: QByteArray generateMainCpp(const QString *errorMessage) const; QByteArray generateProFile(const QString *errorMessage) const; QByteArray generateDesktopFile(const QString *errorMessage) const; - static QString templatesRoot(); + static QString templatesRoot(const QString &dirName); bool addExternalModule(const QString &uri, const QFileInfo &dir, const QFileInfo &contentDir); bool addCppPlugins(QmlModule *module);