diff options
| author | Edward Welbourne <[email protected]> | 2021-09-17 16:07:10 +0200 |
|---|---|---|
| committer | Edward Welbourne <[email protected]> | 2021-09-23 16:57:03 +0200 |
| commit | 298e41b830f60c0f2f078996ace77a4254a9f335 (patch) | |
| tree | 4bf6029da36fb143aeeb11c04a2bdf442ef56b42 /tests/manual/dialogs/messageboxpanel.cpp | |
| parent | e5d65996a93bbf4cbc8a155887def6efa3ad73de (diff) | |
Remove fatuously true or false QT_VERSION checks
QT_VERSION is now at least QT_VERSION_CHECK(6, 3, 0), so remove all
checks against Qt 6.0.0 or earlier. They are superfluous. Tidied up in
some places in the process, particularly #include order.
Change-Id: I2636b2fd13be5b976f5b043ef2f8cddc038a72a4
Reviewed-by: Thiago Macieira <[email protected]>
Diffstat (limited to 'tests/manual/dialogs/messageboxpanel.cpp')
| -rw-r--r-- | tests/manual/dialogs/messageboxpanel.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/tests/manual/dialogs/messageboxpanel.cpp b/tests/manual/dialogs/messageboxpanel.cpp index 6a305523ea5..25c230a855e 100644 --- a/tests/manual/dialogs/messageboxpanel.cpp +++ b/tests/manual/dialogs/messageboxpanel.cpp @@ -138,11 +138,9 @@ void MessageBoxPanel::setupMessageBox(QMessageBox &box) if (box.standardButtons() == QMessageBox::StandardButtons()) box.setStandardButtons(QMessageBox::Ok); // just to have something. -#if QT_VERSION >= 0x050000 box.setCheckBox(0); if (m_checkboxText->text().length() > 0) box.setCheckBox(new QCheckBox(m_checkboxText->text())); -#endif // Qt 5 box.setIcon((QMessageBox::Icon) m_iconComboBox->currentIndex()); } @@ -167,14 +165,12 @@ void MessageBoxPanel::doExec() QString sres; sres.setNum(res, 16); m_resultLabel->setText(QString::fromLatin1("Return value (hex): %1").arg(sres)); -#if QT_VERSION >= 0x050000 if (m_msgbox->checkBox()) { if (m_msgbox->checkBox()->isChecked()) m_checkBoxResult->setText(QString::fromLatin1("Checkbox was checked")); else m_checkBoxResult->setText(QString::fromLatin1("Checkbox was not checked")); } -#endif // Qt 5 } void MessageBoxPanel::doShowApply() |