Changeset 846 for trunk/tools/designer/src/components/propertyeditor/brushpropertymanager.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• tools/designer/src/components/propertyeditor/brushpropertymanager.cpp (modified) (3 diffs)

trunk/tools/designer/src/components/propertyeditor/brushpropertymanager.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -120 +120 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
 const BrushPropertyManager::EnumIndexIconMap &BrushPropertyManager::brushStyleIcons()
 {
     // Create a map of icons for the brush style editor
-    static EnumIndexIconMap rc;
-    if (rc.empty()) {
+    if (brushIcons()->empty()) {
         const int brushStyleCount = sizeof(brushStyles)/sizeof(const char *);
         QBrush brush(Qt::black);
@@ -131 +141 @@
             const Qt::BrushStyle style = brushStyleIndexToStyle(i);
             brush.setStyle(style);
-            rc.insert(i, QtPropertyBrowserUtils::brushValueIcon(brush));
+            insert(i, QtPropertyBrowserUtils::brushValueIcon(brush));
         }
     }
-    return rc;
+    return ;
 }