Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev

1 files changed, 4 insertions, 3 deletions

diff --git a/tests/manual/qscreen/propertyfield.cpp b/tests/manual/qscreen/propertyfield.cpp
index e6392465f2..f1e5e22ec9 100644
--- a/tests/manual/qscreen/propertyfield.cpp
+++ b/tests/manual/qscreen/propertyfield.cpp
@@ -34,8 +34,9 @@
 #include "propertyfield.h"
 #include <QDebug>
 
-PropertyField::PropertyField(QObject* subject, const QMetaProperty& prop, QWidget *parent) :
-    QLineEdit(parent), m_subject(subject), m_lastChangeTime(QTime::currentTime()), m_prop(prop)
+PropertyField::PropertyField(QObject* subject, const QMetaProperty& prop, QWidget *parent)
+  : QLineEdit(parent), m_subject(subject), m_lastChangeTime(QTime::currentTime()), m_prop(prop)
+  , m_defaultBrush(palette().brush(QPalette::Active, QPalette::Text))
 {
     setReadOnly(true);
     if (prop.hasNotifySignal()) {
@@ -99,7 +100,7 @@ void PropertyField::propertyChanged()
             setText(text);
             m_lastText = text;
             m_lastTextShowing = text;
-            modPalette.setBrush(QPalette::Text, Qt::black);
+            modPalette.setBrush(QPalette::Text, m_defaultBrush);
         }
         setPalette(modPalette);
     }