Designer/uic: Start on support for QIcon::fromTheme().

Schemas: Add "theme" attribute to <iconset> element of the UI format.

uic: Extend it to generate the code for icons with themes and/or resource
paths, add auto-test for it.

Designer: Add 'theme'-member to PropertySheetIconValue + convenience
functions including subproperty mask handling and simplify the existing
code. Add new class IconThemeEditor to be used in action editor dialog and
property editor. Theme names can now be specified in the action editor
dialog.

Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
Task-number: QTBUG-7777

1 files changed, 1 insertions, 2 deletions

diff --git a/tools/designer/src/lib/shared/actioneditor.cpp b/tools/designer/src/lib/shared/actioneditor.cpp
index d3716ca..9664a22 100644
--- a/tools/designer/src/lib/shared/actioneditor.cpp
+++ b/tools/designer/src/lib/shared/actioneditor.cpp
@@ -445,7 +445,6 @@ void ActionEditor::slotNewAction()
     if (dlg.exec() == QDialog::Accepted) {
         const ActionData actionData = dlg.actionData();
         m_actionView->clearSelection();
-
         QAction *action = new QAction(formWindow());
         action->setObjectName(actionData.name);
         formWindow()->ensureUniqueObjectName(action);
@@ -480,7 +479,7 @@ static inline bool isSameIcon(const QIcon &i1, const QIcon &i2)
 static QDesignerFormWindowCommand *setIconPropertyCommand(const PropertySheetIconValue &newIcon, QAction *action, QDesignerFormWindowInterface *fw)
 {
     const QString iconProperty = QLatin1String(iconPropertyC);
-    if (newIcon.paths().isEmpty()) {
+    if (newIcon.isEmpty()) {
         ResetPropertyCommand *cmd = new ResetPropertyCommand(fw);
         cmd->init(action, iconProperty);
         return cmd;