From 19aa02c94ecbedc3df6d1d23b656cf6c6b730b67 Mon Sep 17 00:00:00 2001 From: Caroline Chao Date: Tue, 6 Nov 2012 13:45:14 +0100 Subject: [PATCH] Update Qt4 references to Qt. Task-number: QTCREATORBUG-8186 Change-Id: I6ff1ed212d5202dc9ab214c93ea7bca1f07f4e14 Reviewed-by: Pierre Rossi --- src/plugins/madde/maemopackagecreationstep.cpp | 2 +- .../customwidgetwizard/customwidgetwizarddialog.cpp | 4 ++-- src/plugins/qt4projectmanager/makestep.cpp | 4 ++-- .../qt4projectmanager/qt-desktop/qt4runconfiguration.cpp | 2 +- .../qt4projectmanager/wizards/consoleappwizarddialog.cpp | 2 +- .../qt4projectmanager/wizards/emptyprojectwizarddialog.cpp | 2 +- src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp | 2 +- .../qt4projectmanager/wizards/subdirsprojectwizarddialog.cpp | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/plugins/madde/maemopackagecreationstep.cpp b/src/plugins/madde/maemopackagecreationstep.cpp index 9a0a194a97f..1fbb5491edc 100644 --- a/src/plugins/madde/maemopackagecreationstep.cpp +++ b/src/plugins/madde/maemopackagecreationstep.cpp @@ -88,7 +88,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 bc56cabf6d4..f208a4540f3 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 ec4df7f6856..10fecb63720 100644 --- a/src/plugins/qt4projectmanager/makestep.cpp +++ b/src/plugins/qt4projectmanager/makestep.cpp @@ -87,7 +87,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) @@ -408,7 +408,7 @@ void MakeStepConfigWidget::updateDetails() return; } if (!bc) { - setSummaryText(tr("Make: No Qt4 build configuration.")); + setSummaryText(tr("Make: No Qt build configuration.")); return; } diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp index b85185463d6..a14eab21933 100644 --- a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp @@ -695,7 +695,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 638cae2b7a5..5297354ad7d 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 54c62b5770f..ad9a216ca18 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 bd5a0096086..58ef6f43dea 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 bcfeb691cf4..5c878526f44 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))