diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:05:33 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-06-07 14:02:43 +0200 |
| commit | 7cbee5629604aa49c618829c8e3e55fc64e94df7 (patch) | |
| tree | d12041105160c1cb21226b365edb9653d87b5853 /src/widgets/accessible/simplewidgets.cpp | |
| parent | e400b7e326c554ccd819448866265953d2a0f24d (diff) | |
| parent | 5f0ce2333f7e11a3ffb5d16a27cd9303efa712d5 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/widgets/widgets/qmenu.cpp
Change-Id: I6d3baf56eb24501cddb129a3cb6b958ccc25a308
Diffstat (limited to 'src/widgets/accessible/simplewidgets.cpp')
| -rw-r--r-- | src/widgets/accessible/simplewidgets.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/widgets/accessible/simplewidgets.cpp b/src/widgets/accessible/simplewidgets.cpp index aa075cad1b..b8ce9a9060 100644 --- a/src/widgets/accessible/simplewidgets.cpp +++ b/src/widgets/accessible/simplewidgets.cpp @@ -59,7 +59,9 @@ #include <qlabel.h> #endif #include <qgroupbox.h> +#if QT_CONFIG(lcdnumber) #include <qlcdnumber.h> +#endif #include <qlineedit.h> #include <private/qlineedit_p.h> #include <qstyle.h> @@ -422,7 +424,7 @@ QAccessible::Role QAccessibleDisplay::role() const if (l->picture()) return QAccessible::Graphic; #endif -#ifndef QT_NO_MOVIE +#if QT_CONFIG(movie) if (l->movie()) return QAccessible::Animation; #endif @@ -464,7 +466,7 @@ QString QAccessibleDisplay::text(QAccessible::Text t) const str = qt_accStripAmp(str); #endif #endif // QT_CONFIG(label) -#ifndef QT_NO_LCDNUMBER +#if QT_CONFIG(lcdnumber) } else if (qobject_cast<QLCDNumber*>(object())) { QLCDNumber *l = qobject_cast<QLCDNumber*>(object()); if (l->digitCount()) |