summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaroline Chao <caroline.chao@digia.com>2012-11-06 13:45:14 +0100
committerEike Ziller <eike.ziller@digia.com>2012-11-08 12:25:13 +0100
commita3fc029a678a5715d257ab6a669eb29bc9f09000 (patch)
treedc32296bd6a3a77194fa3a8ef2a06571bfd541a7
parent7b2ef0a3b3e1c390dfb722a94c3bccc17a1abaa6 (diff)
downloadqt-creator-a3fc029a678a5715d257ab6a669eb29bc9f09000.tar.gz
Update Qt4 references to Qt.
Task-number: QTCREATORBUG-8186 Change-Id: I6ff1ed212d5202dc9ab214c93ea7bca1f07f4e14 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com> (cherry picked from commit 19aa02c94ecbedc3df6d1d23b656cf6c6b730b67) Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com>
-rw-r--r--src/plugins/madde/maemopackagecreationstep.cpp2
-rw-r--r--src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizarddialog.cpp4
-rw-r--r--src/plugins/qt4projectmanager/makestep.cpp4
-rw-r--r--src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp2
-rw-r--r--src/plugins/qt4projectmanager/wizards/consoleappwizarddialog.cpp2
-rw-r--r--src/plugins/qt4projectmanager/wizards/emptyprojectwizarddialog.cpp2
-rw-r--r--src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp2
-rw-r--r--src/plugins/qt4projectmanager/wizards/subdirsprojectwizarddialog.cpp2
8 files changed, 10 insertions, 10 deletions
diff --git a/src/plugins/madde/maemopackagecreationstep.cpp b/src/plugins/madde/maemopackagecreationstep.cpp
index 58707a2421..6bebd9a851 100644
--- a/src/plugins/madde/maemopackagecreationstep.cpp
+++ b/src/plugins/madde/maemopackagecreationstep.cpp
@@ -86,7 +86,7 @@ bool AbstractMaemoPackageCreationStep::init()
return true;
if (!qt4BuildConfiguration()) {
- raiseError(tr("No Qt4 build configuration"));
+ raiseError(tr("No Qt build configuration"));
return false;
}
diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizarddialog.cpp b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizarddialog.cpp
index bc56cabf6d..f208a4540f 100644
--- a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizarddialog.cpp
+++ b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizarddialog.cpp
@@ -76,8 +76,8 @@ CustomWidgetWizardDialog::CustomWidgetWizardDialog(const QString &templateName,
setWindowIcon(icon);
setWindowTitle(templateName);
- setIntroDescription(tr("This wizard generates a Qt4 Designer Custom Widget "
- "or a Qt4 Designer Custom Widget Collection project."));
+ setIntroDescription(tr("This wizard generates a Qt Designer Custom Widget "
+ "or a Qt Designer Custom Widget Collection project."));
if (!parameters.extraValues().contains(ProjectExplorer::Constants::PROJECT_KIT_IDS))
addTargetSetupPage();
diff --git a/src/plugins/qt4projectmanager/makestep.cpp b/src/plugins/qt4projectmanager/makestep.cpp
index feec0184f5..b9aae765af 100644
--- a/src/plugins/qt4projectmanager/makestep.cpp
+++ b/src/plugins/qt4projectmanager/makestep.cpp
@@ -86,7 +86,7 @@ MakeStep::MakeStep(BuildStepList *bsl, const Core::Id id) :
void MakeStep::ctor()
{
- setDefaultDisplayName(tr("Make", "Qt4 MakeStep display name."));
+ setDefaultDisplayName(tr("Make", "Qt MakeStep display name."));
}
void MakeStep::setMakeCommand(const QString &make)
@@ -416,7 +416,7 @@ void MakeStepConfigWidget::updateDetails()
return;
}
if (!bc) {
- setSummaryText(tr("<b>Make:</b> No Qt4 build configuration."));
+ setSummaryText(tr("<b>Make:</b> No Qt build configuration."));
return;
}
diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
index e316d45222..8a318b6fb8 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
@@ -694,7 +694,7 @@ QString Qt4RunConfiguration::defaultDisplayName()
if (!m_proFilePath.isEmpty())
defaultName = QFileInfo(m_proFilePath).completeBaseName();
else
- defaultName = tr("Qt4 Run Configuration");
+ defaultName = tr("Qt Run Configuration");
return defaultName;
}
diff --git a/src/plugins/qt4projectmanager/wizards/consoleappwizarddialog.cpp b/src/plugins/qt4projectmanager/wizards/consoleappwizarddialog.cpp
index 638cae2b7a..5297354ad7 100644
--- a/src/plugins/qt4projectmanager/wizards/consoleappwizarddialog.cpp
+++ b/src/plugins/qt4projectmanager/wizards/consoleappwizarddialog.cpp
@@ -48,7 +48,7 @@ ConsoleAppWizardDialog::ConsoleAppWizardDialog(const QString &templateName,
setSelectedModules(QLatin1String("core"));
setDeselectedModules(QLatin1String("gui"));
- setIntroDescription(tr("This wizard generates a Qt4 console application "
+ setIntroDescription(tr("This wizard generates a Qt console application "
"project. The application derives from QCoreApplication and does not "
"provide a GUI."));
diff --git a/src/plugins/qt4projectmanager/wizards/emptyprojectwizarddialog.cpp b/src/plugins/qt4projectmanager/wizards/emptyprojectwizarddialog.cpp
index 54c62b5770..ad9a216ca1 100644
--- a/src/plugins/qt4projectmanager/wizards/emptyprojectwizarddialog.cpp
+++ b/src/plugins/qt4projectmanager/wizards/emptyprojectwizarddialog.cpp
@@ -42,7 +42,7 @@ EmptyProjectWizardDialog::EmptyProjectWizardDialog(const QString &templateName,
setWindowIcon(icon);
setWindowTitle(templateName);
- setIntroDescription(tr("This wizard generates an empty Qt4 project. "
+ setIntroDescription(tr("This wizard generates an empty Qt project. "
"Add files to it later on by using the other wizards."));
if (!parameters.extraValues().contains(ProjectExplorer::Constants::PROJECT_KIT_IDS))
diff --git a/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp b/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp
index bd5a009608..58ef6f43de 100644
--- a/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp
+++ b/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp
@@ -59,7 +59,7 @@ GuiAppWizardDialog::GuiAppWizardDialog(const QString &templateName,
setWindowTitle(templateName);
setSelectedModules(QLatin1String("core gui"), true);
- setIntroDescription(tr("This wizard generates a Qt4 GUI application "
+ setIntroDescription(tr("This wizard generates a Qt GUI application "
"project. The application derives by default from QApplication "
"and includes an empty widget."));
diff --git a/src/plugins/qt4projectmanager/wizards/subdirsprojectwizarddialog.cpp b/src/plugins/qt4projectmanager/wizards/subdirsprojectwizarddialog.cpp
index bcfeb691cf..5c878526f4 100644
--- a/src/plugins/qt4projectmanager/wizards/subdirsprojectwizarddialog.cpp
+++ b/src/plugins/qt4projectmanager/wizards/subdirsprojectwizarddialog.cpp
@@ -43,7 +43,7 @@ SubdirsProjectWizardDialog::SubdirsProjectWizardDialog(const QString &templateNa
setWindowIcon(icon);
setWindowTitle(templateName);
- setIntroDescription(tr("This wizard generates a Qt4 subdirs project. "
+ setIntroDescription(tr("This wizard generates a Qt subdirs project. "
"Add subprojects to it later on by using the other wizards."));
if (!parameters.extraValues().contains(ProjectExplorer::Constants::PROJECT_KIT_IDS))