Ignore:
Timestamp:
Aug 2, 2010, 9:27:30 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

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

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/tools/designer/src/lib/shared/actionrepository.cpp

    r651 r769  
    7878}
    7979
    80 static QIcon fixActionIcon(const QIcon &icon)
    81 {
    82     if (icon.isNull())
    83         return qdesigner_internal::emptyIcon();
    84     return icon;
    85 }
    86 
    8780namespace qdesigner_internal {
    8881
     
    9083ActionModel::ActionModel(QWidget *parent ) :
    9184    QStandardItemModel(parent),
     85
    9286    m_core(0)
    9387{
     
    128122       list += item(row, i);
    129123
    130     setItems(m_core, actionOfItem(list.front()), list);
     124    setItems(m_core, actionOfItem(list.front()), list);
    131125}
    132126
     
    151145        items.push_back(item);
    152146    }
    153     setItems(m_core, action, items);
     147    setItems(m_core, action, items);
    154148    appendRow(items);
    155149    return indexFromItem(items.front());
     
    186180}
    187181
    188 void  ActionModel::setItems(QDesignerFormEditorInterface *core, QAction *action, QStandardItemList &sl)
     182void  ActionModel::setItems(QDesignerFormEditorInterface *core, QAction *action,
     183                            const QIcon &defaultIcon,
     184                            QStandardItemList &sl)
    189185{
    190186