Don't print a warning when passing an empty string to QColor

Qt 4.6 didn't used to warn about this, and it should be a valid way of
setting a color to invalid. QColor::isValidColor has been adapted to
still return false when passed an empty string.

Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/src/gui/painting/qcolor.cpp b/src/gui/painting/qcolor.cpp
index 0b735a23bc..cd448a7975 100644
--- a/src/gui/painting/qcolor.cpp
+++ b/src/gui/painting/qcolor.cpp
@@ -548,14 +548,14 @@ void QColor::setNamedColor(const QString &name)
 */
 bool QColor::isValidColor(const QString &name)
 {
-    return QColor().setColorFromString(name);
+    return !name.isEmpty() && QColor().setColorFromString(name);
 }
 
 bool QColor::setColorFromString(const QString &name)
 {
     if (name.isEmpty()) {
         invalidate();
-        return false;
+        return true;
     }
 
     if (name.startsWith(QLatin1Char('#'))) {