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

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Support "icon form theme" inside property editor

2 files changed, 5 insertions, 5 deletions

diff --git a/tools/designer/src/lib/shared/iconselector.cpp b/tools/designer/src/lib/shared/iconselector.cpp
index 8931b9f..ef20cd2 100644
--- a/tools/designer/src/lib/shared/iconselector.cpp
+++ b/tools/designer/src/lib/shared/iconselector.cpp
@@ -583,7 +583,6 @@ IconThemeEditor::IconThemeEditor(QWidget *parent, bool wantResetButton) :
     mainHLayout->setMargin(0);
 
     // Vertically center theme preview label
-    d->m_themeLabel->setFrameStyle(QFrame::Box);
     d->m_themeLabel->setPixmap(d->m_emptyPixmap);
 
     QVBoxLayout *themeLabelVLayout = new QVBoxLayout;
@@ -608,6 +607,7 @@ IconThemeEditor::IconThemeEditor(QWidget *parent, bool wantResetButton) :
     }
 
     setLayout(mainHLayout);
+    setFocusProxy(d->m_themeLineEdit);
 }
 
 IconThemeEditor::~IconThemeEditor()
diff --git a/tools/designer/src/lib/shared/qdesigner_utils.cpp b/tools/designer/src/lib/shared/qdesigner_utils.cpp
index 03d7cfa..bd89c53 100644
--- a/tools/designer/src/lib/shared/qdesigner_utils.cpp
+++ b/tools/designer/src/lib/shared/qdesigner_utils.cpp
@@ -640,8 +640,8 @@ namespace qdesigner_internal
     static inline QPair<QIcon::Mode, QIcon::State> subPropertyFlagToIconModeState(unsigned flag)
     {
         switch (flag) {
-        case NormalOffIconMask:
-            return qMakePair(QIcon::Normal,   QIcon::Off);
+        case NormalOnIconMask:
+            return qMakePair(QIcon::Normal,   QIcon::On);
         case DisabledOffIconMask:
             return qMakePair(QIcon::Disabled, QIcon::Off);
         case DisabledOnIconMask:
@@ -654,11 +654,11 @@ namespace qdesigner_internal
             return qMakePair(QIcon::Selected, QIcon::Off);
         case SelectedOnIconMask:
             return qMakePair(QIcon::Selected, QIcon::On);
-        case NormalOnIconMask:
+        case NormalOffIconMask:
         default:
             break;
         }
-        return     qMakePair(QIcon::Normal,   QIcon::On);
+        return     qMakePair(QIcon::Normal,   QIcon::Off);
     }
 
     uint PropertySheetIconValue::mask() const