diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-09-20 11:37:26 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-09-20 11:58:32 +0200 |
| commit | 01bc69f99f189b03d0b9cad77cc300798937cad1 (patch) | |
| tree | 730f3b691cfc1830ec617b3c2ad8df16180de724 /src/widgets/widgets/qlineedit.cpp | |
| parent | c23c4a921d0e9e2d18a62af82d38ca27eac7bcb3 (diff) | |
| parent | 6d699d08200b1fe3a616dfbc275d46c98b77fcbd (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/plugins/styles/mac/qmacstyle_mac.mm
src/widgets/util/qcompleter.cpp
src/widgets/widgets/qmainwindowlayout.cpp
src/widgets/widgets/qmdisubwindow.cpp
Change-Id: If0e96981af07ce36ac68f2e69211bc2120f93973
Diffstat (limited to 'src/widgets/widgets/qlineedit.cpp')
| -rw-r--r-- | src/widgets/widgets/qlineedit.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/widgets/widgets/qlineedit.cpp b/src/widgets/widgets/qlineedit.cpp index 06e878f657..d0a794222e 100644 --- a/src/widgets/widgets/qlineedit.cpp +++ b/src/widgets/widgets/qlineedit.cpp @@ -40,7 +40,6 @@ #include "qlineedit.h" #include "qlineedit_p.h" -#ifndef QT_NO_LINEEDIT #include "qaction.h" #include "qapplication.h" #include "qclipboard.h" @@ -49,7 +48,9 @@ #include "qevent.h" #include "qfontmetrics.h" #include "qstylehints.h" +#if QT_CONFIG(menu) #include "qmenu.h" +#endif #include "qpainter.h" #include "qpixmap.h" #include "qpointer.h" @@ -61,8 +62,10 @@ #include "qvariant.h" #include "qvector.h" #include "qdebug.h" +#if QT_CONFIG(textedit) #include "qtextedit.h" #include <private/qtextedit_p.h> +#endif #include <private/qwidgettextcontrol_p.h> #ifndef QT_NO_ACCESSIBILITY @@ -2231,5 +2234,3 @@ void QLineEdit::changeEvent(QEvent *ev) QT_END_NAMESPACE #include "moc_qlineedit.cpp" - -#endif // QT_NO_LINEEDIT |