summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@digia.com>2013-10-22 12:11:47 +0200
committerLeena Miettinen <riitta-leena.miettinen@digia.com>2013-10-22 13:50:50 +0200
commit668849cad6f7105122d8c2c2ffa213d853b0155d (patch)
tree8c8d5b0cc832f2b43d1e35adcd6125b8a65e766a
parent964d42850de5551b9a4a2bb678d720a4dc5983bd (diff)
downloadqt-creator-668849cad6f7105122d8c2c2ffa213d853b0155d.tar.gz
Doc: replace Qt GUI Application with Qt Widgets Application
Qt GUI application could also be a Qt Quick application. Update screenshots. Task-number: QTCREATORBUG-10263 Change-Id: I8c0dd34e1222c3b42fddaf3f562e402490ce1037 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
-rw-r--r--doc/images/qmldesigner-new-project.pngbin57693 -> 80229 bytes
-rw-r--r--doc/images/qtcreator-new-qt-gui-application.pngbin69668 -> 51792 bytes
-rw-r--r--doc/images/qtcreator-new-qt-quick-project-wizard.pngbin75500 -> 80709 bytes
-rw-r--r--doc/src/projects/creator-projects-creating.qdoc2
-rw-r--r--doc/src/widgets/qtdesigner-app-tutorial.qdoc2
-rw-r--r--src/plugins/qt4projectmanager/wizards/guiappwizard.cpp2
-rw-r--r--src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp2
7 files changed, 4 insertions, 4 deletions
diff --git a/doc/images/qmldesigner-new-project.png b/doc/images/qmldesigner-new-project.png
index 635329b978..7a6cce9fa1 100644
--- a/doc/images/qmldesigner-new-project.png
+++ b/doc/images/qmldesigner-new-project.png
Binary files differ
diff --git a/doc/images/qtcreator-new-qt-gui-application.png b/doc/images/qtcreator-new-qt-gui-application.png
index 95353a38ca..9682d5abd5 100644
--- a/doc/images/qtcreator-new-qt-gui-application.png
+++ b/doc/images/qtcreator-new-qt-gui-application.png
Binary files differ
diff --git a/doc/images/qtcreator-new-qt-quick-project-wizard.png b/doc/images/qtcreator-new-qt-quick-project-wizard.png
index 571a67eb31..9b4c79f6a8 100644
--- a/doc/images/qtcreator-new-qt-quick-project-wizard.png
+++ b/doc/images/qtcreator-new-qt-quick-project-wizard.png
Binary files differ
diff --git a/doc/src/projects/creator-projects-creating.qdoc b/doc/src/projects/creator-projects-creating.qdoc
index 4b77c31b00..43b99614a2 100644
--- a/doc/src/projects/creator-projects-creating.qdoc
+++ b/doc/src/projects/creator-projects-creating.qdoc
@@ -98,7 +98,7 @@
\list
- \li Qt GUI Application
+ \li Qt Widgets Application
Use \QD forms to design a Qt widget based user interface for the
desktop and C++ to implement the application logic
diff --git a/doc/src/widgets/qtdesigner-app-tutorial.qdoc b/doc/src/widgets/qtdesigner-app-tutorial.qdoc
index 1cdfcf3506..edabb72f5e 100644
--- a/doc/src/widgets/qtdesigner-app-tutorial.qdoc
+++ b/doc/src/widgets/qtdesigner-app-tutorial.qdoc
@@ -42,7 +42,7 @@
\list 1
- \li Select \gui{File > New File or Project > Applications > Qt Gui
+ \li Select \gui{File > New File or Project > Applications > Qt Widgets
Application > Choose}.
\image qtcreator-new-qt-gui-application.png "New File or Project dialog"
diff --git a/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp b/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp
index aaa1f95abc..171277b616 100644
--- a/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp
@@ -78,7 +78,7 @@ GuiAppWizard::GuiAppWizard(bool isMobile)
setCategory(QLatin1String(ProjectExplorer::Constants::QT_APPLICATION_WIZARD_CATEGORY));
setDisplayCategory(QCoreApplication::translate("ProjectExplorer",
ProjectExplorer::Constants::QT_APPLICATION_WIZARD_CATEGORY_DISPLAY));
- setDisplayName(tr("Qt Gui Application"));
+ setDisplayName(tr("Qt Widgets Application"));
setDescription(tr("Creates a Qt application for the desktop. "
"Includes a Qt Designer-based main window.\n\n"
"Preselects a desktop Qt for building the application if available."));
diff --git a/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp b/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp
index cf15d1f2fa..d6a1c534d5 100644
--- a/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp
+++ b/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp
@@ -57,7 +57,7 @@ GuiAppWizardDialog::GuiAppWizardDialog(const QString &templateName,
setWindowTitle(templateName);
setSelectedModules(QLatin1String("core gui"), true);
- setIntroDescription(tr("This wizard generates a Qt GUI application "
+ setIntroDescription(tr("This wizard generates a Qt Widgets Application "
"project. The application derives by default from QApplication "
"and includes an empty widget."));