1 files changed, 9 insertions, 4 deletions
diff --git a/src/widgets/widgets/qlineedit_p.cpp b/src/widgets/widgets/qlineedit_p.cpp
index cccb44c4ef..df8d534afa 100644
--- a/src/widgets/widgets/qlineedit_p.cpp
+++ b/src/widgets/widgets/qlineedit_p.cpp
@@ -218,6 +218,7 @@ void QLineEditPrivate::init(const QString& txt)
 
     QObject::connect(control, SIGNAL(updateNeeded(QRect)),
             q, SLOT(_q_updateNeeded(QRect)));
+    QObject::connect(control, SIGNAL(inputRejected()), q, SIGNAL(inputRejected()));
 
     QStyleOptionFrame opt;
     q->initStyleOption(&opt);
@@ -350,11 +351,9 @@ void QLineEditIconButton::paintEvent(QPaintEvent *)
     QWindow *window = nullptr;
     if (const QWidget *nativeParent = nativeParentWidget())
         window = nativeParent->windowHandle();
-    // Note isDown should really use the active state but in most styles
-    // this has no proper feedback
     QIcon::Mode state = QIcon::Disabled;
     if (isEnabled())
-        state = isDown() ? QIcon::Selected : QIcon::Normal;
+        state = isDown() ? QIcon::Active : QIcon::Normal;
     const QLineEditPrivate *lep = lineEditPrivate();
     const int iconWidth = lep ? lep->sideWidgetParameters().iconSize : 16;
     const QSize iconSize(iconWidth, iconWidth);
@@ -444,7 +443,7 @@ QLineEditPrivate::SideWidgetParameters QLineEditPrivate::sideWidgetParameters()
 {
     Q_Q(const QLineEdit);
     SideWidgetParameters result;
-    result.iconSize = q->height() < 34 ? 16 : 32;
+    result.iconSize = q->style()->pixelMetric(QStyle::PM_SmallIconSize, 0, q);
     result.margin = result.iconSize / 4;
     result.widgetWidth = result.iconSize + 6;
     result.widgetHeight = result.iconSize + 2;
@@ -468,6 +467,8 @@ void QLineEditPrivate::setClearButtonEnabled(bool enabled)
             break;
         }
     }
+#else
+    Q_UNUSED(enabled);
 #endif
 }
 
@@ -485,6 +486,8 @@ void QLineEditPrivate::positionSideWidgets()
 #if QT_CONFIG(action)
             if (e.action->isVisible())
                 widgetGeometry.moveLeft(widgetGeometry.left() + delta);
+#else
+            Q_UNUSED(delta);
 #endif
         }
         widgetGeometry.moveLeft(contentRect.width() - p.widgetWidth - p.margin);
@@ -598,6 +601,8 @@ void QLineEditPrivate::removeAction(QAction *action)
      if (!hasSideWidgets()) // Last widget, remove connection
          QObject::disconnect(q, SIGNAL(textChanged(QString)), q, SLOT(_q_textChanged(QString)));
      q->update();
+#else
+    Q_UNUSED(action);
 #endif // QT_CONFIG(action)
 }