5 files changed, 22 insertions, 4 deletions
diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp
index d8e72588e6..a1434203d3 100644
--- a/src/widgets/widgets/qcombobox.cpp
+++ b/src/widgets/widgets/qcombobox.cpp
@@ -1521,7 +1521,7 @@ int QComboBox::maxCount() const
 /*!
     \obsolete
 
-    Use setCompleter() instead.
+    Use completer() instead.
 */
 bool QComboBox::autoCompletion() const
 {
diff --git a/src/widgets/widgets/qcombobox.h b/src/widgets/widgets/qcombobox.h
index 37b155774d..3b48b151a1 100644
--- a/src/widgets/widgets/qcombobox.h
+++ b/src/widgets/widgets/qcombobox.h
@@ -96,10 +96,13 @@ public:
 
 #if QT_CONFIG(completer)
 #if QT_DEPRECATED_SINCE(5, 13)
+    QT_DEPRECATED_X("Use completer() instead.")
     bool autoCompletion() const;
+    QT_DEPRECATED_X("Use setCompleter() instead.")
     void setAutoCompletion(bool enable);
-
+    QT_DEPRECATED_X("Use completer()->caseSensitivity() instead.")
     Qt::CaseSensitivity autoCompletionCaseSensitivity() const;
+    QT_DEPRECATED_X("Use completer()->setCaseSensitivity() instead.")
     void setAutoCompletionCaseSensitivity(Qt::CaseSensitivity sensitivity);
 #endif
 #endif
diff --git a/src/widgets/widgets/qdatetimeedit.cpp b/src/widgets/widgets/qdatetimeedit.cpp
index 3f41fdeb59..642f35c638 100644
--- a/src/widgets/widgets/qdatetimeedit.cpp
+++ b/src/widgets/widgets/qdatetimeedit.cpp
@@ -1529,7 +1529,7 @@ void QDateTimeEdit::mousePressEvent(QMouseEvent *event)
 QTimeEdit::QTimeEdit(QWidget *parent)
     : QDateTimeEdit(QDATETIMEEDIT_TIME_MIN, QVariant::Time, parent)
 {
-    connect(this, SIGNAL(timeChanged(QTime)), SIGNAL(userTimeChanged(QTime)));
+    connect(this, &QTimeEdit::timeChanged, this, &QTimeEdit::userTimeChanged);
 }
 
 /*!
@@ -1540,6 +1540,7 @@ QTimeEdit::QTimeEdit(QWidget *parent)
 QTimeEdit::QTimeEdit(const QTime &time, QWidget *parent)
     : QDateTimeEdit(time, QVariant::Time, parent)
 {
+    connect(this, &QTimeEdit::timeChanged, this, &QTimeEdit::userTimeChanged);
 }
 
 /*!
@@ -1598,7 +1599,7 @@ QTimeEdit::~QTimeEdit()
 QDateEdit::QDateEdit(QWidget *parent)
     : QDateTimeEdit(QDATETIMEEDIT_DATE_INITIAL, QVariant::Date, parent)
 {
-    connect(this, SIGNAL(dateChanged(QDate)), SIGNAL(userDateChanged(QDate)));
+    connect(this, &QDateEdit::dateChanged, this, &QDateEdit::userDateChanged);
 }
 
 /*!
@@ -1609,6 +1610,7 @@ QDateEdit::QDateEdit(QWidget *parent)
 QDateEdit::QDateEdit(const QDate &date, QWidget *parent)
     : QDateTimeEdit(date, QVariant::Date, parent)
 {
+    connect(this, &QDateEdit::dateChanged, this, &QDateEdit::userDateChanged);
 }
 
 /*!
diff --git a/src/widgets/widgets/qplaintextedit.cpp b/src/widgets/widgets/qplaintextedit.cpp
index bc1ff78de0..4a875975a4 100644
--- a/src/widgets/widgets/qplaintextedit.cpp
+++ b/src/widgets/widgets/qplaintextedit.cpp
@@ -1957,6 +1957,7 @@ void QPlainTextEdit::paintEvent(QPaintEvent *e)
     }
 
     QAbstractTextDocumentLayout::PaintContext context = getPaintContext();
+    painter.setPen(context.palette.text().color());
 
     while (block.isValid()) {
 
diff --git a/src/widgets/widgets/qwidgettextcontrol.cpp b/src/widgets/widgets/qwidgettextcontrol.cpp
index 081acb0998..cad3a64749 100644
--- a/src/widgets/widgets/qwidgettextcontrol.cpp
+++ b/src/widgets/widgets/qwidgettextcontrol.cpp
@@ -61,6 +61,9 @@
 #include "private/qtextdocument_p.h"
 #include "qtextlist.h"
 #include "private/qwidgettextcontrol_p.h"
+#if QT_CONFIG(style_stylesheet)
+#  include "private/qstylesheetstyle_p.h"
+#endif
 #if QT_CONFIG(graphicsview)
 #include "qgraphicssceneevent.h"
 #endif
@@ -3256,6 +3259,15 @@ QAbstractTextDocumentLayout::PaintContext QWidgetTextControl::getPaintContext(QW
 
     ctx.selections = d->extraSelections;
     ctx.palette = d->palette;
+#if QT_CONFIG(style_stylesheet)
+    if (widget) {
+        if (auto cssStyle = qt_styleSheet(widget->style())) {
+            QStyleOption option;
+            option.initFrom(widget);
+            cssStyle->styleSheetPalette(widget, &option, &ctx.palette);
+        }
+    }
+#endif // style_stylesheet
     if (d->cursorOn && d->isEnabled) {
         if (d->hideCursor)
             ctx.cursorPosition = -1;