1 files changed, 34 insertions, 7 deletions

diff --git a/src/designer/src/components/taskmenu/itemlisteditor.cpp b/src/designer/src/components/taskmenu/itemlisteditor.cpp
index 8aca0916d..700cf136c 100644
--- a/src/designer/src/components/taskmenu/itemlisteditor.cpp
+++ b/src/designer/src/components/taskmenu/itemlisteditor.cpp
@@ -116,12 +116,17 @@ static QStringList c2qStringList(const char * const in[])
     return out;
 }
 
-void AbstractItemEditor::setupProperties(PropertyDefinition *propList)
+void AbstractItemEditor::setupProperties(const PropertyDefinition *propList,
+                                         Qt::Alignment alignDefault)
 {
     for (int i = 0; propList[i].name; i++) {
         int type = propList[i].typeFunc ? propList[i].typeFunc() : propList[i].type;
         int role = propList[i].role;
         QtVariantProperty *prop = m_propertyManager->addProperty(type, QLatin1String(propList[i].name));
+        if (role == Qt::TextAlignmentRole) {
+            prop->setAttribute(DesignerPropertyManager::alignDefaultAttribute(),
+                               QVariant(uint(alignDefault)));
+        }
         Q_ASSERT(prop);
         if (role == Qt::ToolTipPropertyRole || role == Qt::WhatsThisPropertyRole)
             prop->setAttribute(QStringLiteral("validationMode"), ValidationRichText);
@@ -148,9 +153,11 @@ void AbstractItemEditor::setupObject(QWidget *object)
     m_editorFactory->setFormWindowBase(fwb);
 }
 
-void AbstractItemEditor::setupEditor(QWidget *object, PropertyDefinition *propList)
+void AbstractItemEditor::setupEditor(QWidget *object,
+                                     const PropertyDefinition *propList,
+                                     Qt::Alignment alignDefault)
 {
-    setupProperties(propList);
+    setupProperties(propList, alignDefault);
     setupObject(object);
 }
 
@@ -208,6 +215,9 @@ void AbstractItemEditor::resetProperty(QtProperty *property)
     if (m_propertyManager->resetIconSubProperty(property))
         return;
 
+    if (m_propertyManager->resetTextAlignmentProperty(property))
+        return;
+
     BoolBlocker block(m_updatingBrowser);
 
     QtVariantProperty *prop = m_propertyManager->variantProperty(property);
@@ -243,15 +253,18 @@ void AbstractItemEditor::updateBrowser()
     for (QtVariantProperty *prop : qAsConst(m_properties)) {
         int role = m_propertyToRole.value(prop);
         QVariant val = getItemData(role);
+
+        bool modified = false;
         if (!val.isValid()) {
             if (role == ItemFlagsShadowRole)
                 val = QVariant::fromValue(defaultItemFlags());
             else
                 val = QVariant(int(prop->value().userType()), nullptr);
-            prop->setModified(false);
         } else {
-            prop->setModified(true);
+            modified = role != Qt::TextAlignmentRole
+                || val.toUInt() != DesignerPropertyManager::alignDefault(prop);
         }
+        prop->setModified(modified);
         prop->setValue(val);
     }
 
@@ -296,9 +309,11 @@ ItemListEditor::ItemListEditor(QDesignerFormWindowInterface *form, QWidget *pare
     connect(iconCache(), &DesignerIconCache::reloaded, this, &AbstractItemEditor::cacheReloaded);
 }
 
-void ItemListEditor::setupEditor(QWidget *object, PropertyDefinition *propList)
+void ItemListEditor::setupEditor(QWidget *object,
+                                 const PropertyDefinition *propList,
+                                 Qt::Alignment alignDefault)
 {
-    AbstractItemEditor::setupEditor(object, propList);
+    AbstractItemEditor::setupEditor(object, propList, alignDefault);
 
     if (ui.listWidget->count() > 0)
         ui.listWidget->setCurrentRow(0);
@@ -319,6 +334,8 @@ void ItemListEditor::on_newListItemButton_clicked()
 
     QListWidgetItem *item = new QListWidgetItem(m_newItemText);
     item->setData(Qt::DisplayPropertyRole, QVariant::fromValue(PropertySheetStringValue(m_newItemText)));
+    if (m_alignDefault != 0)
+        item->setTextAlignment(Qt::Alignment(m_alignDefault));
     item->setFlags(item->flags() | Qt::ItemIsEditable);
     if (row < ui.listWidget->count())
         ui.listWidget->insertItem(row, item);
@@ -466,6 +483,16 @@ void ItemListEditor::updateEditor()
     else
         m_propertyBrowser->clear();
 }
+
+uint ItemListEditor::alignDefault() const
+{
+    return m_alignDefault;
+}
+
+void ItemListEditor::setAlignDefault(uint newAlignDefault)
+{
+    m_alignDefault = newAlignDefault;
+}
 } // namespace qdesigner_internal
 
 QT_END_NAMESPACE