diff options
Diffstat (limited to 'src/widgets/widgets/qlineedit_p.cpp')
| -rw-r--r-- | src/widgets/widgets/qlineedit_p.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/widgets/widgets/qlineedit_p.cpp b/src/widgets/widgets/qlineedit_p.cpp index 0eeff196a8..33d542abc0 100644 --- a/src/widgets/widgets/qlineedit_p.cpp +++ b/src/widgets/widgets/qlineedit_p.cpp @@ -216,6 +216,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); @@ -348,11 +349,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); @@ -466,6 +465,8 @@ void QLineEditPrivate::setClearButtonEnabled(bool enabled) break; } } +#else + Q_UNUSED(enabled); #endif } @@ -483,6 +484,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); @@ -596,6 +599,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) } |