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

Merge remote-tracking branch 'origin/4.9'

Browse Source 
Conflicts:
	src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.cpp
	src/plugins/qmldesigner/qmldesignerextension/timelineeditor/preseteditor.cpp
	src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinesettingsmodel.cpp
	src/shared/qbs

Change-Id: I369368de9b9c682b03e224d489589043e1f6782b
This commit is contained in:
Eike Ziller
2019-05-28 14:01:01 +02:00
parent 93dfbad97b aff3e204c1
commit 4704f49fbb
26 changed files with 846 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.cpp
View File

@@ -349,11 +349,6 @@ void CMakeBuildSettingsWidget::setError(const QString &message)
m_errorMessageLabel->setVisible(showError);
m_errorMessageLabel->setText(message);
m_errorMessageLabel->setToolTip(message);
m_editButton->setEnabled(!showError);
m_unsetButton->setEnabled(!showError);
m_resetButton->setEnabled(!showError);
m_showAdvancedCheckBox->setEnabled(!showError);
}
void CMakeBuildSettingsWidget::setWarning(const QString &message)