diff options
| author | Paul Olav Tvete <paul.tvete@qt.io> | 2017-01-25 10:10:07 +0100 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@qt.io> | 2017-01-25 14:38:00 +0000 |
| commit | 2bbeebf80c127979d1859c8486774df22be4c3f2 (patch) | |
| tree | 724cfa122eedc67cc341cd2c63ebdb4b42b8b914 /src/widgets | |
| parent | 2ac7fb78b9928a7bac133e474d483b14e65d0a65 (diff) | |
Fix build with -no-feature-textedit
Change-Id: I4a75c134803043180c57287ca352e26e3422204c
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/configure.json | 2 | ||||
| -rw-r--r-- | src/widgets/dialogs/qmessagebox.cpp | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/widgets/configure.json b/src/widgets/configure.json index 92a57534e6..84500bff21 100644 --- a/src/widgets/configure.json +++ b/src/widgets/configure.json @@ -435,7 +435,7 @@ "label": "QInputDialog", "purpose": "Provides a simple convenience dialog to get a single value from the user.", "section": "Dialogs", - "condition": "features.combobox && features.spinbox && features.stackedwidget", + "condition": "features.combobox && features.spinbox && features.stackedwidget && features.textedit", "output": [ "publicFeature", "feature" ] }, "errormessage": { diff --git a/src/widgets/dialogs/qmessagebox.cpp b/src/widgets/dialogs/qmessagebox.cpp index 57b3f47863..98d070e493 100644 --- a/src/widgets/dialogs/qmessagebox.cpp +++ b/src/widgets/dialogs/qmessagebox.cpp @@ -336,8 +336,10 @@ void QMessageBoxPrivate::setupLayout() #else grid->addWidget(buttonBox, grid->rowCount(), 0, 1, grid->columnCount()); #endif +#if QT_CONFIG(textedit) if (detailsText) grid->addWidget(detailsText, grid->rowCount(), 0, 1, grid->columnCount()); +#endif grid->setSizeConstraint(QLayout::SetNoConstraint); q->setLayout(grid); @@ -2654,7 +2656,9 @@ void QMessageBoxPrivate::helperPrepareShow(QPlatformDialogHelper *) options->setWindowTitle(q->windowTitle()); options->setText(q->text()); options->setInformativeText(q->informativeText()); +#if QT_CONFIG(textedit) options->setDetailedText(q->detailedText()); +#endif options->setIcon(helperIcon(q->icon())); options->setStandardButtons(helperStandardButtons(q)); } |