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

Merge remote-tracking branch 'origin/master' into 4.14

Browse Source 
Change-Id: I4b37b89cc1dd2c53217579ea554af0fb7994fa7e
This commit is contained in:
Eike Ziller
2020-10-06 10:24:41 +02:00
parent a99127d73b 97c6c13dcb
commit d323eeec52
70 changed files with 354 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmakeprojectmanager/qmakestep.cpp
View File

@@ -502,9 +502,9 @@ bool QMakeStep::fromMap(const QVariantMap &map)
return BuildStep::fromMap(map);
}
BuildStepConfigWidget *QMakeStep::createConfigWidget()
QWidget *QMakeStep::createConfigWidget()
{
auto widget = new BuildStepConfigWidget(this);
auto widget = new QWidget;
auto label_0 = new QLabel(tr("qmake build configuration:"), widget);