1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build with -no-feature-messagebox

Browse Source 
Change-Id: I4c34f6aa2106afc528f182d7925442acf82b7000
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 1613975d954f0d88ca8cdde59b34c13d72e9d140)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Tasuku Suzuki 2023-01-16 02:13:29 +09:00 committed by Qt Cherry-pick Bot
parent 2f96d72f4d
commit d72d38daf7
4 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/printsupport/dialogs/qprintdialog_unix.cpp
View File

@ -322,7 +322,7 @@ void QPrintPropertiesDialog::reject()
void QPrintPropertiesDialog::accept() void QPrintPropertiesDialog::accept()
{ {
#if QT_CONFIG(cups) #if QT_CONFIG(cups) && QT_CONFIG(messagebox)
if (widget.pageSetup->hasPpdConflict()) { if (widget.pageSetup->hasPpdConflict()) {
widget.tabs->setCurrentWidget(widget.tabPage); widget.tabs->setCurrentWidget(widget.tabPage);
const QMessageBox::StandardButton answer = QMessageBox::warning(this, tr("Page Setup Conflicts"), const QMessageBox::StandardButton answer = QMessageBox::warning(this, tr("Page Setup Conflicts"),
@ -990,7 +990,7 @@ int QPrintDialog::exec()
void QPrintDialog::accept() void QPrintDialog::accept()
{ {
Q_D(QPrintDialog); Q_D(QPrintDialog);
#if QT_CONFIG(cups) #if QT_CONFIG(cups) && QT_CONFIG(messagebox)
if (d->options.pagesRadioButton->isChecked() && printer()->pageRanges().isEmpty()) { if (d->options.pagesRadioButton->isChecked() && printer()->pageRanges().isEmpty()) {
QMessageBox::critical(this, tr("Invalid Pages Definition"), QMessageBox::critical(this, tr("Invalid Pages Definition"),
tr("%1 does not follow the correct syntax. Please use ',' to separate " tr("%1 does not follow the correct syntax. Please use ',' to separate "

2
src/widgets/accessible/qaccessiblewidgetfactory.cpp
View File

@ -84,8 +84,10 @@ QAccessibleInterface *qAccessibleFactory(const QString &classname, QObject *obje
#endif #endif
} else if (classname == "QDialog"_L1) { } else if (classname == "QDialog"_L1) {
iface = new QAccessibleWidget(widget, QAccessible::Dialog); iface = new QAccessibleWidget(widget, QAccessible::Dialog);
#if QT_CONFIG(messagebox)
} else if (classname == "QMessageBox"_L1) { } else if (classname == "QMessageBox"_L1) {
iface = new QAccessibleMessageBox(widget); iface = new QAccessibleMessageBox(widget);
#endif
#if QT_CONFIG(mainwindow) #if QT_CONFIG(mainwindow)
} else if (classname == "QMainWindow"_L1) { } else if (classname == "QMainWindow"_L1) {
iface = new QAccessibleMainWindow(widget); iface = new QAccessibleMainWindow(widget);

4
src/widgets/accessible/simplewidgets.cpp
View File

@ -43,7 +43,9 @@
#ifndef QT_NO_PICTURE #ifndef QT_NO_PICTURE
#include <QtGui/qpicture.h> #include <QtGui/qpicture.h>
#endif #endif
#if QT_CONFIG(messagebox)
#include <qmessagebox.h> #include <qmessagebox.h>
#endif
#include <qdialogbuttonbox.h> #include <qdialogbuttonbox.h>
#include <qstyle.h> #include <qstyle.h>
#include <qstyleoption.h> #include <qstyleoption.h>
@ -953,6 +955,7 @@ QWindowContainer *QAccessibleWindowContainer::container() const
return static_cast<QWindowContainer *>(widget()); return static_cast<QWindowContainer *>(widget());
} }
#if QT_CONFIG(messagebox)
/*! /*!
\internal \internal
Implements QAccessibleWidget for QMessageBox Implements QAccessibleWidget for QMessageBox
@ -993,6 +996,7 @@ QString QAccessibleMessageBox::text(QAccessible::Text t) const
return str; return str;
} }
#endif
#endif // QT_CONFIG(accessibility) #endif // QT_CONFIG(accessibility)

2
src/widgets/accessible/simplewidgets_p.h
View File

@ -190,6 +190,7 @@ private:
QWindowContainer *container() const; QWindowContainer *container() const;
}; };
#if QT_CONFIG(messagebox)
class QAccessibleMessageBox : public QAccessibleWidget class QAccessibleMessageBox : public QAccessibleWidget
{ {
public: public:
@ -199,6 +200,7 @@ public:
QMessageBox *messageBox() const; QMessageBox *messageBox() const;
}; };
#endif
#endif // QT_CONFIG(accessibility) #endif // QT_CONFIG(accessibility)