diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-09-26 16:08:55 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-09-26 16:14:54 +0200 |
| commit | aadfe7d634de04519102c5827ca885dc2e2199c9 (patch) | |
| tree | d92db346ca95332b177036a53f1f6beb2e24fb74 /src/widgets/widgets/qlineedit_p.h | |
| parent | 4b6c1448047362b8c38d265e6414f0e3e59b8d37 (diff) | |
| parent | a732e16d5fd9dbf8a0289fec9f948b12e9ba2c19 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/gui/kernel/qguiapplication.cpp
src/platformsupport/input/libinput/qlibinputpointer.cpp
src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h
src/plugins/platforms/cocoa/qcocoawindow.h
src/testlib/qtestsystem.h
Change-Id: I5975ffb3261c2dd82fe02ec4e57df7c0950226c5
Diffstat (limited to 'src/widgets/widgets/qlineedit_p.h')
| -rw-r--r-- | src/widgets/widgets/qlineedit_p.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/widgets/widgets/qlineedit_p.h b/src/widgets/widgets/qlineedit_p.h index 0dcf1c04c8..a3f549ad31 100644 --- a/src/widgets/widgets/qlineedit_p.h +++ b/src/widgets/widgets/qlineedit_p.h @@ -53,7 +53,6 @@ #include <QtWidgets/private/qtwidgetsglobal_p.h> -#ifndef QT_NO_LINEEDIT #include "private/qwidget_p.h" #include "QtWidgets/qlineedit.h" #if QT_CONFIG(toolbutton) @@ -63,7 +62,9 @@ #include "QtGui/qicon.h" #include "QtWidgets/qstyleoption.h" #include "QtCore/qbasictimer.h" +#if QT_CONFIG(completer) #include "QtWidgets/qcompleter.h" +#endif #include "QtCore/qpointer.h" #include "QtCore/qmimedata.h" @@ -71,6 +72,8 @@ #include <algorithm> +QT_REQUIRE_CONFIG(lineedit); + QT_BEGIN_NAMESPACE class QLineEditPrivate; @@ -203,7 +206,7 @@ public: #endif void _q_selectionChanged(); void _q_updateNeeded(const QRect &); -#ifndef QT_NO_COMPLETER +#if QT_CONFIG(completer) void _q_completionHighlighted(const QString &); #endif QPoint mousePressPos; @@ -254,8 +257,6 @@ private: Q_DECLARE_TYPEINFO(QLineEditPrivate::SideWidgetEntry, Q_PRIMITIVE_TYPE); Q_DECLARE_TYPEINFO(QLineEditPrivate::SideWidgetLocation, Q_PRIMITIVE_TYPE); -#endif // QT_NO_LINEEDIT - QT_END_NAMESPACE #endif // QLINEEDIT_P_H |