Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (53 commits)
  remove non wifi interfaces from being handled.
  Disable auto-uppercasing and predictive text for password line edits.
  Avoid QString reallocation in QTextEngine::itemize()
  Remove the Qt 4.7 #if guards that were needed for 4.6
  Always redraw the complete control when an input event comes in.
  Make sure not to crash if createStandardContextMenu() returns 0 (e.g. on Maemo5)
  Fix compilation: include QString in order to use QString.
  Fix compile
  Block the Maemo5 window attribute values from being assigned to something else on other platforms.
  be more verbose when warning about incompatible libraries
  Introduce a setAttribute_internal helper
  Do not reset state too early on RMB click
  Fix for QRadioButtons and QCheckBoxes drawn incorrectly when a style sheet is set.
  Speed up creation of the pixmap cache key
  Optimize QGtkStyle
  fix qmake -project mode
  test qlist some more
  fix include
  Don't print a warning when passing an empty string to QColor
  Stabilize QWidget
  ...

1 files changed, 2 insertions, 2 deletions

diff --git a/src/gui/painting/qcolor.cpp b/src/gui/painting/qcolor.cpp
index 0b735a2..cd448a7 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('#'))) {