summaryrefslogtreecommitdiffstats
path: root/src/widgets/widgets/qlineedit_p.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/widgets/widgets/qlineedit_p.cpp')
-rw-r--r--src/widgets/widgets/qlineedit_p.cpp11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/widgets/widgets/qlineedit_p.cpp b/src/widgets/widgets/qlineedit_p.cpp
index 7c32a9cd7a..c66b842223 100644
--- a/src/widgets/widgets/qlineedit_p.cpp
+++ b/src/widgets/widgets/qlineedit_p.cpp
@@ -40,8 +40,6 @@
#include "qlineedit.h"
#include "qlineedit_p.h"
-#ifndef QT_NO_LINEEDIT
-
#include "qvariant.h"
#if QT_CONFIG(itemviews)
#include "qabstractitemview.h"
@@ -58,6 +56,7 @@
#endif
#include <qpainter.h>
#include <qpropertyanimation.h>
+#include <qvalidator.h>
QT_BEGIN_NAMESPACE
@@ -90,7 +89,7 @@ QRect QLineEditPrivate::cursorRect() const
return adjustedControlRect(control->cursorRect());
}
-#ifndef QT_NO_COMPLETER
+#if QT_CONFIG(completer)
void QLineEditPrivate::_q_completionHighlighted(const QString &newText)
{
@@ -111,7 +110,7 @@ void QLineEditPrivate::_q_completionHighlighted(const QString &newText)
}
}
-#endif // QT_NO_COMPLETER
+#endif // QT_CONFIG(completer)
void QLineEditPrivate::_q_handleWindowActivate()
{
@@ -124,7 +123,7 @@ void QLineEditPrivate::_q_textEdited(const QString &text)
{
Q_Q(QLineEdit);
emit q->textEdited(text);
-#ifndef QT_NO_COMPLETER
+#if QT_CONFIG(completer)
if (control->completer()
&& control->completer()->completionMode() != QCompleter::InlineCompletion)
control->complete(-1); // update the popup on cut/paste/del
@@ -624,5 +623,3 @@ int QLineEditPrivate::effectiveRightTextMargin() const
QT_END_NAMESPACE
#include "moc_qlineedit_p.cpp"
-
-#endif