Changeset 769 for trunk/tools/designer/src/lib/shared/actionrepository.cpp
- Timestamp:
- Aug 2, 2010, 9:27:30 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/vendor/nokia/qt/4.6.3 (added) merged: 768 /branches/vendor/nokia/qt/current merged: 767 /branches/vendor/nokia/qt/4.6.2 removed
- Property svn:mergeinfo changed
-
trunk/tools/designer/src/lib/shared/actionrepository.cpp
r651 r769 78 78 } 79 79 80 static QIcon fixActionIcon(const QIcon &icon)81 {82 if (icon.isNull())83 return qdesigner_internal::emptyIcon();84 return icon;85 }86 87 80 namespace qdesigner_internal { 88 81 … … 90 83 ActionModel::ActionModel(QWidget *parent ) : 91 84 QStandardItemModel(parent), 85 92 86 m_core(0) 93 87 { … … 128 122 list += item(row, i); 129 123 130 setItems(m_core, actionOfItem(list.front()), list);124 setItems(m_core, actionOfItem(list.front()), list); 131 125 } 132 126 … … 151 145 items.push_back(item); 152 146 } 153 setItems(m_core, action, items);147 setItems(m_core, action, items); 154 148 appendRow(items); 155 149 return indexFromItem(items.front()); … … 186 180 } 187 181 188 void ActionModel::setItems(QDesignerFormEditorInterface *core, QAction *action, QStandardItemList &sl) 182 void ActionModel::setItems(QDesignerFormEditorInterface *core, QAction *action, 183 const QIcon &defaultIcon, 184 QStandardItemList &sl) 189 185 { 190 186