diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-08-15 16:30:10 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-08-15 16:31:48 +0200 |
| commit | 106d3b9bf93325ea93c678270290b2c3dda9b764 (patch) | |
| tree | 26c56932d60964c83e81d9c33d6f37ebc36d6c56 /src/widgets/accessible/qaccessiblewidgets_p.h | |
| parent | 79f679da9483c12979500dd48bc096d33af9ca6f (diff) | |
| parent | 8bebded9ab02b8eec67c44bfddf802d6bf9cda3c (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/plugins/platforms/cocoa/qcocoamenu.h
src/plugins/platforms/cocoa/qcocoamenu.mm
src/plugins/platforms/cocoa/qcocoawindow.mm
src/widgets/styles/qstylehelper_p.h
Change-Id: I54247c98dd79d2b3826fc062b8b11048c9c7d9bb
Diffstat (limited to 'src/widgets/accessible/qaccessiblewidgets_p.h')
| -rw-r--r-- | src/widgets/accessible/qaccessiblewidgets_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/accessible/qaccessiblewidgets_p.h b/src/widgets/accessible/qaccessiblewidgets_p.h index 3ff67c0c9b..050930243d 100644 --- a/src/widgets/accessible/qaccessiblewidgets_p.h +++ b/src/widgets/accessible/qaccessiblewidgets_p.h @@ -256,7 +256,7 @@ public: }; #endif -#if !defined(QT_NO_TEXTBROWSER) && !defined(QT_NO_CURSOR) +#if QT_CONFIG(textbrowser) && !defined(QT_NO_CURSOR) class QAccessibleTextBrowser : public QAccessibleTextEdit { public: @@ -264,7 +264,7 @@ public: QAccessible::Role role() const Q_DECL_OVERRIDE; }; -#endif // QT_NO_TEXTBROWSER && QT_NO_CURSOR +#endif // QT_CONFIG(textbrowser) && QT_NO_CURSOR #if QT_CONFIG(calendarwidget) class QAccessibleCalendarWidget : public QAccessibleWidget |