feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.14'

Browse Source 
Conflicts:
	src/plugins/designer/cpp/formclasswizard.h
	src/plugins/designer/cpp/formclasswizarddialog.h

Change-Id: I9f9d166e1a9249022305503f9cbe571136c2a2b1
This commit is contained in:
Eike Ziller
2020-11-25 11:25:34 +01:00
parent 02c876f6e8 edef529df6
commit 8245523653
169 changed files with 1147 additions and 865 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/designer/cpp/formclasswizarddialog.cpp
View File

@@ -62,11 +62,6 @@ void FormClassWizardDialog::setPath(const QString &p)
m_classPage->setPath(p);
}
bool FormClassWizardDialog::validateCurrentPage()
{
return QWizard::validateCurrentPage();
}
void FormClassWizardDialog::initializePage(int id)
{
Core::BaseFileWizard::initializePage(id);

2
src/plugins/designer/cpp/formclasswizarddialog.h
View File

@@ -50,8 +50,6 @@ public:
Designer::FormClassWizardParameters parameters() const;
bool validateCurrentPage() final;
protected:
void initializePage(int id) final;