Do not assume implicit string-ish → QColor conversion

We want to mark the corresponding QColor ctor(s) explicit.
Use Qt::GlobalColor or the new QColor::fromString() instead.

Change-Id: I68bf75a094e6821b97682de5a0ffd975834d22d0
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

3 files changed, 4 insertions, 4 deletions

diff --git a/examples/embedded/flickable/main.cpp b/examples/embedded/flickable/main.cpp
index 139baa6ba7..cb3920d428 100644
--- a/examples/embedded/flickable/main.cpp
+++ b/examples/embedded/flickable/main.cpp
@@ -101,8 +101,8 @@ public:
             m_colorNames << (str + "   " + c);
 
             QStringList duet = c.split(' ');
-            m_firstColor << duet[0];
-            m_secondColor << duet[1];
+            m_firstColor << QColor::fromString(duet[0]);
+            m_secondColor << QColor::fromString(duet[1]);
         }
 
         setAttribute(Qt::WA_OpaquePaintEvent, true);
diff --git a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
index 820a879d63..c4ede66381 100644
--- a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
+++ b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
@@ -3548,7 +3548,7 @@ void tst_QSettings::rainersSyncBugOnMac()
 void tst_QSettings::recursionBug()
 {
     QPixmap pix(10,10);
-    pix.fill("blue");
+    pix.fill(Qt::blue);
 
     {
         QSettings settings(settingsPath("starrunner.ini"), QSettings::IniFormat);
diff --git a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp
index a987c06d15..e022b7edbc 100644
--- a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp
+++ b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp
@@ -2180,7 +2180,7 @@ void tst_QTextEdit::setDocumentPreservesPalette()
 
     QPalette defaultPal = ed->palette();
     QPalette whitePal = ed->palette();
-    whitePal.setColor(QPalette::Active, QPalette::Text, "white");
+    whitePal.setColor(QPalette::Active, QPalette::Text, Qt::white);
 
 
     QVERIFY(whitePal != ed->palette());