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 707d5c4e85d..00000000000 Binary files a/share/qtcreator/templates/qmlapp/maemoicon.png and /dev/null differ 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);