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

Core: Guard against pages that forgot to create their widgets

Browse Source 
This should not happen, but when it happens, the resulting crash is
quite cryptic. Make it a bit more obvious.

Change-Id: Icbe40206cfdbae93ccb072d7027fcaf109f2f39f
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
hjk
2023-07-07 13:08:45 +02:00
parent 57b6b8630c
commit 2a731003cf
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/coreplugin/dialogs/ioptionspage.cpp
View File

@@ -132,6 +132,7 @@ QWidget *IOptionsPage::widget()
if (!m_widget) { if (!m_widget) {
if (m_widgetCreator) { if (m_widgetCreator) {
m_widget = m_widgetCreator(); m_widget = m_widgetCreator();
QTC_CHECK(m_widget);
} else if (m_settingsProvider) { } else if (m_settingsProvider) {
m_widget = new IOptionsPageWidget; m_widget = new IOptionsPageWidget;
AspectContainer *container = m_settingsProvider(); AspectContainer *container = m_settingsProvider();

9
src/plugins/coreplugin/dialogs/settingsdialog.cpp
View File

@@ -345,9 +345,12 @@ private:
void showEvent(QShowEvent *event) final void showEvent(QShowEvent *event) final
{ {
if (!widget()) { if (!widget()) {
QWidget *inner = m_page->widget(); if (QWidget *inner = m_page->widget()) {
setWidget(inner); setWidget(inner);
inner->setAutoFillBackground(false); inner->setAutoFillBackground(false);
} else {
QTC_CHECK(false);
}
} }
QScrollArea::showEvent(event); QScrollArea::showEvent(event);