diff --git a/share/qtcreator/templates/qmlapp/app.pro b/share/qtcreator/templates/qtquickapp/app.pro similarity index 100% rename from share/qtcreator/templates/qmlapp/app.pro rename to share/qtcreator/templates/qtquickapp/app.pro diff --git a/share/qtcreator/templates/qmlapp/main.cpp b/share/qtcreator/templates/qtquickapp/main.cpp similarity index 100% rename from share/qtcreator/templates/qmlapp/main.cpp rename to share/qtcreator/templates/qtquickapp/main.cpp diff --git a/share/qtcreator/templates/qmlapp/qml/app/main.qml b/share/qtcreator/templates/qtquickapp/qml/app/main.qml similarity index 100% rename from share/qtcreator/templates/qmlapp/qml/app/main.qml rename to share/qtcreator/templates/qtquickapp/qml/app/main.qml diff --git a/share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.cpp b/share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp similarity index 100% rename from share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.cpp rename to share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp diff --git a/share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.h b/share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.h similarity index 100% rename from share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.h rename to share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.h diff --git a/share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.pri b/share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.pri similarity index 100% rename from share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.pri rename to share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.pri diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index 7a6edc1779a..1e53d8fa341 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -18546,7 +18546,7 @@ IDs müssen außerdem mit einem Kleinbuchstaben beginnen. - QmlStandaloneAppWizardSourcesPage + QtQuickAppWizardSourcesPage WizardPage WizardPage @@ -20756,7 +20756,7 @@ Bitte prüfen Sie, ob das Gerät verbunden ist und die Anwendung 'TRK' - Qt4ProjectManager::Internal::QmlStandaloneApp + Qt4ProjectManager::Internal::QtQuickApp The QML import path '%1' cannot be found. Der QML-Importpfad '%1' konnte nicht gefunden werden. @@ -20779,7 +20779,7 @@ Bitte prüfen Sie, ob das Gerät verbunden ist und die Anwendung 'TRK' - Qt4ProjectManager::Internal::QmlStandaloneAppWizardDialog + Qt4ProjectManager::Internal::QtQuickAppWizardDialog New Qt Quick Application Neue Qt Quick-Anwendung @@ -20794,7 +20794,7 @@ Bitte prüfen Sie, ob das Gerät verbunden ist und die Anwendung 'TRK' - Qt4ProjectManager::Internal::QmlStandaloneAppWizardSourcesPage + Qt4ProjectManager::Internal::QtQuickAppWizardSourcesPage Select QML File QML-Datei auswählen @@ -21370,7 +21370,7 @@ Wählt Qt-Versionen für Simulator und mobile Ziele aus, sofern sie verfügbar s - Qt4ProjectManager::Internal::QmlStandaloneAppWizard + Qt4ProjectManager::Internal::QtQuickAppWizard Qt Quick Application Neue Qt Quick-Anwendung diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts index e63d4e6bff1..ed5a1be283a 100644 --- a/share/qtcreator/translations/qtcreator_fr.ts +++ b/share/qtcreator/translations/qtcreator_fr.ts @@ -26038,7 +26038,7 @@ Preselects Qt for Simulator and mobile targets if available - QmlStandaloneAppWizardSourcesPage + QtQuickAppWizardSourcesPage WizardPage WizardPage @@ -28660,7 +28660,7 @@ Présélectionne la version de Qt pour le simulateur et les mobiles si disponibl - Qt4ProjectManager::Internal::QmlStandaloneApp + Qt4ProjectManager::Internal::QtQuickApp The QML import path '%1' cannot be found. Le chemin d'import QML '%1' est introuvable. @@ -28683,7 +28683,7 @@ Présélectionne la version de Qt pour le simulateur et les mobiles si disponibl - Qt4ProjectManager::Internal::QmlStandaloneAppWizardDialog + Qt4ProjectManager::Internal::QtQuickAppWizardDialog New Qt Quick Application Nouvelle application Qt Quick @@ -28698,7 +28698,7 @@ Présélectionne la version de Qt pour le simulateur et les mobiles si disponibl - Qt4ProjectManager::Internal::QmlStandaloneAppWizard + Qt4ProjectManager::Internal::QtQuickAppWizard Qt Quick Application Application Qt Quick @@ -28713,7 +28713,7 @@ Vous pouvez construire l'application et la déployer sur un ordinateur de b - Qt4ProjectManager::Internal::QmlStandaloneAppWizardSourcesPage + Qt4ProjectManager::Internal::QtQuickAppWizardSourcesPage Select QML File Sélectionner un fichier QML diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts index 96741629a06..b42e8de9752 100644 --- a/share/qtcreator/translations/qtcreator_ja.ts +++ b/share/qtcreator/translations/qtcreator_ja.ts @@ -21906,7 +21906,7 @@ Preselects Qt for Simulator and mobile targets if available - QmlStandaloneAppWizardSourcesPage + QtQuickAppWizardSourcesPage WizardPage ウィザードページ @@ -24700,7 +24700,7 @@ Preselects Qt for Simulator and mobile targets if available. - Qt4ProjectManager::Internal::QmlStandaloneApp + Qt4ProjectManager::Internal::QtQuickApp The QML import path '%1' cannot be found. QML インポート パス '%1' が見つかりませんでした。 @@ -24723,7 +24723,7 @@ Preselects Qt for Simulator and mobile targets if available. - Qt4ProjectManager::Internal::QmlStandaloneAppWizardDialog + Qt4ProjectManager::Internal::QtQuickAppWizardDialog New Qt Quick Application Qt Quick アプリケーションの新規作成 @@ -24738,7 +24738,7 @@ Preselects Qt for Simulator and mobile targets if available. - Qt4ProjectManager::Internal::QmlStandaloneAppWizard + Qt4ProjectManager::Internal::QtQuickAppWizard Qt Quick Application Qt Quick アプリケーション @@ -24753,7 +24753,7 @@ You can build the application and deploy it on desktop and mobile target platfor - Qt4ProjectManager::Internal::QmlStandaloneAppWizardSourcesPage + Qt4ProjectManager::Internal::QtQuickAppWizardSourcesPage Select QML File QML ファイルを選択 diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/translations/qtcreator_pl.ts index 8ddbbb5fd06..f1bf8708d62 100644 --- a/share/qtcreator/translations/qtcreator_pl.ts +++ b/share/qtcreator/translations/qtcreator_pl.ts @@ -18761,7 +18761,7 @@ aktywny tylko po wpisaniu przedrostka - QmlStandaloneAppWizardSourcesPage + QtQuickAppWizardSourcesPage WizardPage StronaKreatora @@ -21422,7 +21422,7 @@ Wstępnie wybiera wersję Qt dla Symulatora i aplikacji mobilnych (jeśli jest d - Qt4ProjectManager::Internal::QmlStandaloneApp + Qt4ProjectManager::Internal::QtQuickApp The QML import path '%1' cannot be found. Nie można odnaleźć ścieżki importu QML "%1". @@ -21445,7 +21445,7 @@ Wstępnie wybiera wersję Qt dla Symulatora i aplikacji mobilnych (jeśli jest d - Qt4ProjectManager::Internal::QmlStandaloneAppWizardDialog + Qt4ProjectManager::Internal::QtQuickAppWizardDialog New Qt Quick Application Nowa aplikacja Qt Quick @@ -21460,7 +21460,7 @@ Wstępnie wybiera wersję Qt dla Symulatora i aplikacji mobilnych (jeśli jest d - Qt4ProjectManager::Internal::QmlStandaloneAppWizard + Qt4ProjectManager::Internal::QtQuickAppWizard Qt Quick Application Aplikacja Qt Quick @@ -21760,7 +21760,7 @@ Powód: %2 - Qt4ProjectManager::Internal::QmlStandaloneAppWizardSourcesPage + Qt4ProjectManager::Internal::QtQuickAppWizardSourcesPage Select QML File Wybierz plik QML diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts index 1fc9ec35e30..4073965af37 100644 --- a/share/qtcreator/translations/qtcreator_ru.ts +++ b/share/qtcreator/translations/qtcreator_ru.ts @@ -14671,7 +14671,7 @@ You can review Qt Quick UI projects in the QML Viewer and you need not build the - QmlStandaloneAppWizardSourcesPage + QtQuickAppWizardSourcesPage WizardPage @@ -16475,7 +16475,7 @@ stderr was: %1 - Qt4ProjectManager::Internal::QmlStandaloneApp + Qt4ProjectManager::Internal::QtQuickApp The QML import path '%1' cannot be found. Не удалось найти путь импорта QML "%1". @@ -16498,7 +16498,7 @@ stderr was: %1 - Qt4ProjectManager::Internal::QmlStandaloneAppWizard + Qt4ProjectManager::Internal::QtQuickAppWizard Qt Quick Application Приложение Qt Quick @@ -16513,7 +16513,7 @@ You can build the application and deploy it on desktop and mobile target platfor - Qt4ProjectManager::Internal::QmlStandaloneAppWizardDialog + Qt4ProjectManager::Internal::QtQuickAppWizardDialog New Qt Quick Application Новое приложение Qt Quick @@ -16528,7 +16528,7 @@ You can build the application and deploy it on desktop and mobile target platfor - Qt4ProjectManager::Internal::QmlStandaloneAppWizardSourcesPage + Qt4ProjectManager::Internal::QtQuickAppWizardSourcesPage Select QML File Выбор файла QML diff --git a/share/qtcreator/translations/qtcreator_uk.ts b/share/qtcreator/translations/qtcreator_uk.ts index 02495e4f71f..c5bcf3cf034 100644 --- a/share/qtcreator/translations/qtcreator_uk.ts +++ b/share/qtcreator/translations/qtcreator_uk.ts @@ -18775,7 +18775,7 @@ The following encodings are likely to fit: - QmlStandaloneAppWizardSourcesPage + QtQuickAppWizardSourcesPage WizardPage @@ -20964,7 +20964,7 @@ Check if the phone is connected and App TRK is running. - Qt4ProjectManager::Internal::QmlStandaloneApp + Qt4ProjectManager::Internal::QtQuickApp The QML import path '%1' cannot be found. @@ -21900,7 +21900,7 @@ Preselects Qt for Simulator and mobile targets if available. - Qt4ProjectManager::Internal::QmlStandaloneAppWizardDialog + Qt4ProjectManager::Internal::QtQuickAppWizardDialog New Qt Quick Application @@ -21915,7 +21915,7 @@ Preselects Qt for Simulator and mobile targets if available. - Qt4ProjectManager::Internal::QmlStandaloneAppWizard + Qt4ProjectManager::Internal::QtQuickAppWizard Qt Quick Application @@ -22022,7 +22022,7 @@ You can build the application and deploy it on desktop and mobile target platfor - Qt4ProjectManager::Internal::QmlStandaloneAppWizardSourcesPage + Qt4ProjectManager::Internal::QtQuickAppWizardSourcesPage Select QML File diff --git a/share/qtcreator/translations/qtcreator_zh_CN.ts b/share/qtcreator/translations/qtcreator_zh_CN.ts index 99b1e14eee6..129ca81f17f 100644 --- a/share/qtcreator/translations/qtcreator_zh_CN.ts +++ b/share/qtcreator/translations/qtcreator_zh_CN.ts @@ -25579,7 +25579,7 @@ Id必须以小写字母开头. - QmlStandaloneAppWizardSourcesPage + QtQuickAppWizardSourcesPage WizardPage 向导页面 @@ -28347,7 +28347,7 @@ Preselects Qt for Simulator and mobile targets if available. - Qt4ProjectManager::Internal::QmlStandaloneApp + Qt4ProjectManager::Internal::QtQuickApp The QML import path '%1' cannot be found. QML引入路径'%1'无法找到. @@ -28370,7 +28370,7 @@ Preselects Qt for Simulator and mobile targets if available. - Qt4ProjectManager::Internal::QmlStandaloneAppWizardDialog + Qt4ProjectManager::Internal::QtQuickAppWizardDialog New Qt Quick Application 新建Qt Quick工程 @@ -28385,7 +28385,7 @@ Preselects Qt for Simulator and mobile targets if available. - Qt4ProjectManager::Internal::QmlStandaloneAppWizard + Qt4ProjectManager::Internal::QtQuickAppWizard Qt Quick Application Qt Quick应用程序 @@ -28398,7 +28398,7 @@ You can build the application and deploy it on desktop and mobile target platfor - Qt4ProjectManager::Internal::QmlStandaloneAppWizardSourcesPage + Qt4ProjectManager::Internal::QtQuickAppWizardSourcesPage Select QML File 选择QMl文件 diff --git a/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp b/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp index a8bb6666704..ee634a3eb2b 100644 --- a/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp +++ b/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp @@ -125,7 +125,7 @@ bool QtQuickApp::setExternalModules(const QStringList &uris, foreach (const QFileInfo &importPath, importPaths) { if (!importPath.exists()) { m_error = QCoreApplication::translate( - "Qt4ProjectManager::Internal::QmlStandaloneApp", + "Qt4ProjectManager::Internal::QtQuickApp", "The QML import path '%1' cannot be found.") .arg(QDir::toNativeSeparators(importPath.filePath())); return false; @@ -149,7 +149,7 @@ bool QtQuickApp::setExternalModules(const QStringList &uris, } if (modulesCount == m_modules.count()) { // no module was added m_error = QCoreApplication::translate( - "Qt4ProjectManager::Internal::QmlStandaloneApp", + "Qt4ProjectManager::Internal::QtQuickApp", "The QML module '%1' cannot be found.").arg(uri); return false; } @@ -185,14 +185,14 @@ QString QtQuickApp::pathExtended(int fileType) const case QmlDirProFileRelative: return useExistingMainQml() ? appProFilePath.relativeFilePath(m_mainQmlFile.canonicalPath()) : QString(qmlSubDir).remove(qmlSubDir.length() - 1, 1); case ModulesDir: return QLatin1String("modules"); - default: qFatal("QmlStandaloneApp::pathExtended() needs more work"); + default: qFatal("QtQuickApp::pathExtended() needs more work"); } return QString(); } QString QtQuickApp::originsRoot() const { - return templatesRoot() + QLatin1String("qmlapp/"); + return templatesRoot() + QLatin1String("qtquickapp/"); } QString QtQuickApp::mainWindowClassName() const @@ -281,7 +281,7 @@ bool QtQuickApp::addCppPlugin(const QString &qmldirLine, QmlModule *module) qmldirLine.split(QLatin1Char(' '), QString::SkipEmptyParts); if (qmldirLineElements.count() < 2) { m_error = QCoreApplication::translate( - "Qt4ProjectManager::Internal::QmlStandaloneApp", + "Qt4ProjectManager::Internal::QtQuickApp", "Invalid '%1' entry in '%2' of module '%3'.") .arg(qmldir_plugin).arg(qmldir).arg(module->uri); return false; @@ -310,7 +310,7 @@ bool QtQuickApp::addCppPlugin(const QString &qmldirLine, QmlModule *module) foundProFile = proFile_guess4.canonicalFilePath(); } else { m_error = QCoreApplication::translate( - "Qt4ProjectManager::Internal::QmlStandaloneApp", + "Qt4ProjectManager::Internal::QtQuickApp", "No .pro file for plugin '%1' cannot be found.").arg(name); return false; } diff --git a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp index 1499d39176a..52c146fd142 100644 --- a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp +++ b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp @@ -51,19 +51,19 @@ namespace Qt4ProjectManager { namespace Internal { -class QmlStandaloneAppWizardDialog : public AbstractMobileAppWizardDialog +class QtQuickAppWizardDialog : public AbstractMobileAppWizardDialog { Q_OBJECT public: - explicit QmlStandaloneAppWizardDialog(QWidget *parent = 0); + explicit QtQuickAppWizardDialog(QWidget *parent = 0); private: class QtQuickAppWizardSourcesPage *m_qmlSourcesPage; friend class QtQuickAppWizard; }; -QmlStandaloneAppWizardDialog::QmlStandaloneAppWizardDialog(QWidget *parent) +QtQuickAppWizardDialog::QtQuickAppWizardDialog(QWidget *parent) : AbstractMobileAppWizardDialog(parent) , m_qmlSourcesPage(0) { @@ -78,7 +78,7 @@ QmlStandaloneAppWizardDialog::QmlStandaloneAppWizardDialog(QWidget *parent) class QtQuickAppWizardPrivate { class QtQuickApp *app; - class QmlStandaloneAppWizardDialog *wizardDialog; + class QtQuickAppWizardDialog *wizardDialog; friend class QtQuickAppWizard; }; @@ -116,7 +116,7 @@ Core::BaseFileWizardParameters QtQuickAppWizard::parameters() AbstractMobileAppWizardDialog *QtQuickAppWizard::createWizardDialogInternal(QWidget *parent) const { - m_d->wizardDialog = new QmlStandaloneAppWizardDialog(parent); + m_d->wizardDialog = new QtQuickAppWizardDialog(parent); return m_d->wizardDialog; } @@ -143,7 +143,7 @@ void QtQuickAppWizard::prepareGenerateFiles(const QWizard *w, QString *errorMessage) const { Q_UNUSED(errorMessage) - const QmlStandaloneAppWizardDialog *wizard = qobject_cast(w); + const QtQuickAppWizardDialog *wizard = qobject_cast(w); const QString mainQmlFile = wizard->m_qmlSourcesPage->mainQmlFile(); m_d->app->setMainQmlFile(mainQmlFile); }