forked from qt-creator/qt-creator
Update Qt4 references to Qt.
Task-number: QTCREATORBUG-8186 Change-Id: I6ff1ed212d5202dc9ab214c93ea7bca1f07f4e14 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
This commit is contained in:
@@ -88,7 +88,7 @@ bool AbstractMaemoPackageCreationStep::init()
|
|||||||
return true;
|
return true;
|
||||||
|
|
||||||
if (!qt4BuildConfiguration()) {
|
if (!qt4BuildConfiguration()) {
|
||||||
raiseError(tr("No Qt4 build configuration"));
|
raiseError(tr("No Qt build configuration"));
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -76,8 +76,8 @@ CustomWidgetWizardDialog::CustomWidgetWizardDialog(const QString &templateName,
|
|||||||
setWindowIcon(icon);
|
setWindowIcon(icon);
|
||||||
setWindowTitle(templateName);
|
setWindowTitle(templateName);
|
||||||
|
|
||||||
setIntroDescription(tr("This wizard generates a Qt4 Designer Custom Widget "
|
setIntroDescription(tr("This wizard generates a Qt Designer Custom Widget "
|
||||||
"or a Qt4 Designer Custom Widget Collection project."));
|
"or a Qt Designer Custom Widget Collection project."));
|
||||||
|
|
||||||
if (!parameters.extraValues().contains(ProjectExplorer::Constants::PROJECT_KIT_IDS))
|
if (!parameters.extraValues().contains(ProjectExplorer::Constants::PROJECT_KIT_IDS))
|
||||||
addTargetSetupPage();
|
addTargetSetupPage();
|
||||||
|
|||||||
@@ -87,7 +87,7 @@ MakeStep::MakeStep(BuildStepList *bsl, const Core::Id id) :
|
|||||||
|
|
||||||
void MakeStep::ctor()
|
void MakeStep::ctor()
|
||||||
{
|
{
|
||||||
setDefaultDisplayName(tr("Make", "Qt4 MakeStep display name."));
|
setDefaultDisplayName(tr("Make", "Qt MakeStep display name."));
|
||||||
}
|
}
|
||||||
|
|
||||||
void MakeStep::setMakeCommand(const QString &make)
|
void MakeStep::setMakeCommand(const QString &make)
|
||||||
@@ -408,7 +408,7 @@ void MakeStepConfigWidget::updateDetails()
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (!bc) {
|
if (!bc) {
|
||||||
setSummaryText(tr("<b>Make:</b> No Qt4 build configuration."));
|
setSummaryText(tr("<b>Make:</b> No Qt build configuration."));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -695,7 +695,7 @@ QString Qt4RunConfiguration::defaultDisplayName()
|
|||||||
if (!m_proFilePath.isEmpty())
|
if (!m_proFilePath.isEmpty())
|
||||||
defaultName = QFileInfo(m_proFilePath).completeBaseName();
|
defaultName = QFileInfo(m_proFilePath).completeBaseName();
|
||||||
else
|
else
|
||||||
defaultName = tr("Qt4 Run Configuration");
|
defaultName = tr("Qt Run Configuration");
|
||||||
return defaultName;
|
return defaultName;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ ConsoleAppWizardDialog::ConsoleAppWizardDialog(const QString &templateName,
|
|||||||
setSelectedModules(QLatin1String("core"));
|
setSelectedModules(QLatin1String("core"));
|
||||||
setDeselectedModules(QLatin1String("gui"));
|
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 "
|
"project. The application derives from QCoreApplication and does not "
|
||||||
"provide a GUI."));
|
"provide a GUI."));
|
||||||
|
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ EmptyProjectWizardDialog::EmptyProjectWizardDialog(const QString &templateName,
|
|||||||
setWindowIcon(icon);
|
setWindowIcon(icon);
|
||||||
setWindowTitle(templateName);
|
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."));
|
"Add files to it later on by using the other wizards."));
|
||||||
|
|
||||||
if (!parameters.extraValues().contains(ProjectExplorer::Constants::PROJECT_KIT_IDS))
|
if (!parameters.extraValues().contains(ProjectExplorer::Constants::PROJECT_KIT_IDS))
|
||||||
|
|||||||
@@ -59,7 +59,7 @@ GuiAppWizardDialog::GuiAppWizardDialog(const QString &templateName,
|
|||||||
setWindowTitle(templateName);
|
setWindowTitle(templateName);
|
||||||
setSelectedModules(QLatin1String("core gui"), true);
|
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 "
|
"project. The application derives by default from QApplication "
|
||||||
"and includes an empty widget."));
|
"and includes an empty widget."));
|
||||||
|
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ SubdirsProjectWizardDialog::SubdirsProjectWizardDialog(const QString &templateNa
|
|||||||
setWindowIcon(icon);
|
setWindowIcon(icon);
|
||||||
setWindowTitle(templateName);
|
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."));
|
"Add subprojects to it later on by using the other wizards."));
|
||||||
|
|
||||||
if (!parameters.extraValues().contains(ProjectExplorer::Constants::PROJECT_KIT_IDS))
|
if (!parameters.extraValues().contains(ProjectExplorer::Constants::PROJECT_KIT_IDS))
|
||||||
|
|||||||
Reference in New Issue
Block a user