whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert features.calendarwidget to QT_[REQUIRE_]CONFIG 

Change-Id: I93c2e00828a233f004c599bd0702d0a470ae29ff
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
bb10
Stephan Binner 2017-07-22 15:15:12 +02:00
parent 9a0e8895d6
commit 3ade30a2af
7 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -209,7 +209,7 @@ QAccessibleInterface *qAccessibleFactory(const QString &classname, QObject *obje
} else if (classname == QLatin1String("QScrollArea")) {
iface = new QAccessibleScrollArea(widget);
#endif
#ifndef QT_NO_CALENDARWIDGET
#if QT_CONFIG(calendarwidget)
} else if (classname == QLatin1String("QCalendarWidget")) {
iface = new QAccessibleCalendarWidget(widget);
#endif

6
src/widgets/accessible/qaccessiblewidgets.cpp
View File

@ -62,7 +62,9 @@
#include <QRubberBand>
#endif
#include <QTextBrowser>
#if QT_CONFIG(calendarwidget)
#include <QCalendarWidget>
#endif
#include <QAbstractItemView>
#include <QDockWidget>
#include <QMainWindow>
@ -506,7 +508,7 @@ QAccessible::Role QAccessibleTextBrowser::role() const
}
#endif // QT_NO_TEXTBROWSER && QT_NO_CURSOR
#ifndef QT_NO_CALENDARWIDGET
#if QT_CONFIG(calendarwidget)
// ===================== QAccessibleCalendarWidget ========================
QAccessibleCalendarWidget::QAccessibleCalendarWidget(QWidget *widget)
: QAccessibleWidget(widget, QAccessible::Table)
@ -561,7 +563,7 @@ QWidget *QAccessibleCalendarWidget::navigationBar() const
}
return 0;
}
#endif // QT_NO_CALENDARWIDGET
#endif // QT_CONFIG(calendarwidget)
#ifndef QT_NO_DOCKWIDGET

4
src/widgets/accessible/qaccessiblewidgets_p.h
View File

@ -266,7 +266,7 @@ public:
};
#endif // QT_NO_TEXTBROWSER && QT_NO_CURSOR
#ifndef QT_NO_CALENDARWIDGET
#if QT_CONFIG(calendarwidget)
class QAccessibleCalendarWidget : public QAccessibleWidget
{
public:
@ -284,7 +284,7 @@ private:
QAbstractItemView *calendarView() const;
QWidget *navigationBar() const;
};
#endif // QT_NO_CALENDARWIDGET
#endif // QT_CONFIG(calendarwidget)
#ifndef QT_NO_DOCKWIDGET
class QAccessibleDockWidget: public QAccessibleWidget

4
src/widgets/widgets/qcalendarwidget.cpp
View File

@ -39,8 +39,6 @@
#include "qcalendarwidget.h"
#ifndef QT_NO_CALENDARWIDGET
#include <qabstractitemmodel.h>
#include <qitemdelegate.h>
#include <qdatetime.h>
@ -3129,5 +3127,3 @@ QT_END_NAMESPACE
#include "qcalendarwidget.moc"
#include "moc_qcalendarwidget.cpp"
#endif //QT_NO_CALENDARWIDGET

8
src/widgets/widgets/qcalendarwidget.h
View File

@ -44,11 +44,10 @@
#include <QtWidgets/qwidget.h>
#include <QtCore/qdatetime.h>
QT_REQUIRE_CONFIG(calendarwidget);
QT_BEGIN_NAMESPACE
#ifndef QT_NO_CALENDARWIDGET
class QDate;
class QTextCharFormat;
class QCalendarWidgetPrivate;
@ -184,9 +183,6 @@ private:
};
#endif // QT_NO_CALENDARWIDGET
QT_END_NAMESPACE
#endif // QCALENDARWIDGET_H

7
src/widgets/widgets/widgets.pri
View File

@ -5,7 +5,6 @@ HEADERS += \
widgets/qbuttongroup_p.h \
widgets/qabstractspinbox.h \
widgets/qabstractspinbox_p.h \
widgets/qcalendarwidget.h \
widgets/qcombobox.h \
widgets/qcombobox_p.h \
widgets/qdial.h \
@ -67,7 +66,6 @@ HEADERS += \
SOURCES += \
widgets/qbuttongroup.cpp \
widgets/qabstractspinbox.cpp \
widgets/qcalendarwidget.cpp \
widgets/qcombobox.cpp \
widgets/qdial.cpp \
widgets/qdockwidget.cpp \
@ -129,6 +127,11 @@ qtConfig(abstractslider) {
widgets/qabstractslider.cpp
}
qtConfig(calendarwidget) {
HEADERS += widgets/qcalendarwidget.h
SOURCES += widgets/qcalendarwidget.cpp
}
qtConfig(checkbox) {
HEADERS += \
widgets/qcheckbox.h

4
tests/auto/other/qaccessibility/tst_qaccessibility.cpp
View File

@ -3344,7 +3344,7 @@ void tst_QAccessibility::tableTest()
void tst_QAccessibility::calendarWidgetTest()
{
#ifndef QT_NO_CALENDARWIDGET
#if QT_CONFIG(calendarwidget)
{
QCalendarWidget calendarWidget;
@ -3420,7 +3420,7 @@ void tst_QAccessibility::calendarWidgetTest()
}
QTestAccessibility::clearEvents();
#endif // QT_NO_CALENDARWIDGET
#endif // QT_CONFIG(calendarwidget)
}
void tst_QAccessibility::dockWidgetTest()