AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build with -no-feature-textedit

Browse Source 
Change-Id: I4a75c134803043180c57287ca352e26e3422204c
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Paul Olav Tvete 2017-01-25 10:10:07 +01:00
parent 2ac7fb78b9
commit 2bbeebf80c
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/widgets/configure.json
View File

@ -435,7 +435,7 @@
"label": "QInputDialog", "label": "QInputDialog",
"purpose": "Provides a simple convenience dialog to get a single value from the user.", "purpose": "Provides a simple convenience dialog to get a single value from the user.",
"section": "Dialogs", "section": "Dialogs",
"condition": "features.combobox && features.spinbox && features.stackedwidget", "condition": "features.combobox && features.spinbox && features.stackedwidget && features.textedit",
"output": [ "publicFeature", "feature" ] "output": [ "publicFeature", "feature" ]
}, },
"errormessage": { "errormessage": {

4
src/widgets/dialogs/qmessagebox.cpp
View File

@ -336,8 +336,10 @@ void QMessageBoxPrivate::setupLayout()
#else #else
grid->addWidget(buttonBox, grid->rowCount(), 0, 1, grid->columnCount()); grid->addWidget(buttonBox, grid->rowCount(), 0, 1, grid->columnCount());
#endif #endif
#if QT_CONFIG(textedit)
if (detailsText) if (detailsText)
grid->addWidget(detailsText, grid->rowCount(), 0, 1, grid->columnCount()); grid->addWidget(detailsText, grid->rowCount(), 0, 1, grid->columnCount());
#endif
grid->setSizeConstraint(QLayout::SetNoConstraint); grid->setSizeConstraint(QLayout::SetNoConstraint);
q->setLayout(grid); q->setLayout(grid);
@ -2654,7 +2656,9 @@ void QMessageBoxPrivate::helperPrepareShow(QPlatformDialogHelper *)
options->setWindowTitle(q->windowTitle()); options->setWindowTitle(q->windowTitle());
options->setText(q->text()); options->setText(q->text());
options->setInformativeText(q->informativeText()); options->setInformativeText(q->informativeText());
#if QT_CONFIG(textedit)
options->setDetailedText(q->detailedText()); options->setDetailedText(q->detailedText());
#endif
options->setIcon(helperIcon(q->icon())); options->setIcon(helperIcon(q->icon()));
options->setStandardButtons(helperStandardButtons(q)); options->setStandardButtons(helperStandardButtons(q));
} }