Merge branch 'KDE/4.10'

This commit is contained in:
Marco Martin 2012-12-28 20:41:03 +01:00
commit fba3fe8966

View File

@ -160,7 +160,7 @@ void DeclarativeAppletScript::qmlCreationFinished()
lay->setContentsMargins(0, 0, 0, 0); lay->setContentsMargins(0, 0, 0, 0);
DeclarativeItemContainer *declarativeItemContainer = new DeclarativeItemContainer(a); DeclarativeItemContainer *declarativeItemContainer = new DeclarativeItemContainer(a);
lay->addItem(declarativeItemContainer); lay->addItem(declarativeItemContainer);
declarativeItemContainer->setDeclarativeItem(declarativeIcon); declarativeItemContainer->setDeclarativeItem(declarativeIcon, true);
} else { } else {
pa->setPopupIcon(a->icon()); pa->setPopupIcon(a->icon());
} }