[pull] master from mapeditor:master

.github/workflows/packages.yml

@@ -26,23 +26,20 @@ env:
   SENTRY_PROJECT: tiled
   TILED_RELEASE: ${{ startsWith(github.ref, 'refs/tags/v') }}
   TILED_SNAPSHOT: ${{ !startsWith(github.ref, 'refs/tags/v') }}
-  SIGNING_ENABLED: ${{ secrets.SIGNING_ENABLED }}
 
 jobs:
   version:
     name: Determine Tiled version
     runs-on: ubuntu-latest
     outputs:
       version: ${{ steps.get-version.outputs.version }}
-      release: ${{ steps.get-version.outputs.release }}
 
     steps:
     - name: Get version
       id: get-version
       run: |
         if [[ "$TILED_RELEASE" == 'true' ]]; then echo "version=${GITHUB_REF:11}" >> $GITHUB_OUTPUT ; fi
         if [[ "$TILED_RELEASE" != 'true' ]]; then echo "version=$(date "+%Y.%m.%d")" >> $GITHUB_OUTPUT ; fi
-        echo "release=${TILED_RELEASE}" >> $GITHUB_OUTPUT
 
   linux:
     name: Linux (AppImage)
@@ -133,7 +130,7 @@ jobs:
 
     - name: Upload symbols and sources to Sentry
       if: github.repository == 'mapeditor/tiled' && github.event_name == 'push'
-      continue-on-error: ${{ needs.version.outputs.release == 'false' }}
+      continue-on-error: ${{ !startsWith(github.ref, 'refs/tags/v') }}
       env:
         SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
       run: |
@@ -191,7 +188,7 @@ jobs:
 
     - name: Release snap (beta channel)
       uses: snapcore/action-publish@master
-      if: github.repository == 'mapeditor/tiled' && github.event_name == 'push' && (github.ref == 'refs/heads/snapshot' || needs.version.outputs.release == 'true')
+      if: github.repository == 'mapeditor/tiled' && github.event_name == 'push' && (github.ref == 'refs/heads/snapshot' || startsWith(github.ref, 'refs/tags/v'))
       env:
         SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_STORE_LOGIN }}
       with:
@@ -219,6 +216,7 @@ jobs:
 
     env:
       TILED_VERSION: ${{ needs.version.outputs.version }}
+      SIGNING_ENABLED: ${{ secrets.SIGNING_ENABLED }}
 
     steps:
     - name: Checkout repository
@@ -444,7 +442,7 @@ jobs:
     permissions:
       contents: write
 
-    if: github.repository == 'mapeditor/tiled' && github.event_name == 'push' && needs.version.outputs.release == 'true'
+    if: github.repository == 'mapeditor/tiled' && github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
 
     steps:
     - name: Download all artifacts
@@ -469,7 +467,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [version, linux, macos, windows]
 
-    if: github.repository == 'mapeditor/tiled' && github.event_name == 'push' && needs.version.outputs.release == 'true'
+    if: github.repository == 'mapeditor/tiled' && github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
 
     steps:
     - name: Checkout repository

NEWS.md

@@ -1,4 +1,4 @@
-### Unreleased
+### Tiled 1.12.0 (12 March 2026)
 
 * Rewritten Properties view to enable direct widget interaction (#4045)
 * Added support for lists in custom properties (#1493)
@@ -48,16 +48,17 @@
 * Workaround tileset view layout regression in Qt 6.9
 * Raised minimum supported Qt version from 5.12 to 5.15.2
 * AppImage: Updated to Sentry 0.12.8
+* Updated Bulgarian translation
 
-### Tiled 1.11.2 (28 Jan 2025)
+### Tiled 1.11.2 (28 January 2025)
 
 * YY plugin: Fixed compatibility with GameMaker 2024 (#4132)
 * Fixed crash while handling file reloads without any files opened
 * Fixed crash when closing the last file with multiple custom properties selected
 * snap: Fixed crash on startup on Wayland
 * AppImage: Updated to Sentry 0.7.19
 
-### Tiled 1.11.1 (11 Jan 2025)
+### Tiled 1.11.1 (11 January 2025)
 
 * Releases now ship with support for loading Aseprite images (#4109)
 * Scripting: Added `FileFormat.nameFilter`

appveyor.yml

@@ -1,5 +1,5 @@
 clone_depth: 200
-version: '1.11.{build}'
+version: '1.12.{build}'
 image:
   - Visual Studio 2022
 

docs/conf.py

@@ -67,9 +67,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.11'
+version = '1.12'
 # The full version, including alpha/beta/rc tags.
-release = '1.11.2'
+release = '1.12.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -201,6 +201,3 @@
      author, 'Tiled', 'One line description of project.',
      'Miscellaneous'),
 ]
-
-
-

src/tiled/aboutdialog.cpp

@@ -51,7 +51,7 @@ AboutDialog::AboutDialog(QWidget *parent): QDialog(parent)
             "<p align=\"center\">You may modify and redistribute this program under the terms of the GPL (version 2 or later). "
             "A copy of the GPL is contained in the 'COPYING' file distributed with Tiled.</p>\n"
             "<p align=\"center\"><a href=\"https://www.mapeditor.org/\">https://www.mapeditor.org/</a></p>\n")
-            .arg(QApplication::applicationVersion(), QStringLiteral("2025"));
+            .arg(QApplication::applicationVersion(), QStringLiteral("2026"));
 
     textBrowser->setHtml(html);
 

src/tiled/propertytypeseditor.cpp

@@ -572,7 +572,8 @@ void PropertyTypesEditor::openAddMemberDialog()
 
         connect(mAddValueProperty, &Property::addRequested, this, [this] (bool focus) {
             const auto &name = mAddValueProperty->name();
-            addMember(name, mAddValueProperty->value());
+            const bool reportExisting = focus;
+            addMember(name, mAddValueProperty->value(), reportExisting);
 
             if (auto property = mMembersProperty->property(name)) {
                 if (focus)
@@ -592,7 +593,7 @@ void PropertyTypesEditor::openAddMemberDialog()
     mMembersView->focusProperty(mAddValueProperty, PropertiesView::FocusLabel);
 }
 
-void PropertyTypesEditor::addMember(const QString &name, const QVariant &value)
+void PropertyTypesEditor::addMember(const QString &name, const QVariant &value, bool reportExisting)
 {
     if (name.isEmpty())
         return;
@@ -603,9 +604,11 @@ void PropertyTypesEditor::addMember(const QString &name, const QVariant &value)
 
     auto &classType = static_cast<ClassPropertyType&>(*propertyType);
     if (classType.members.contains(name)) {
-        QMessageBox::critical(this,
-                              tr("Error Adding Member"),
-                              tr("There is already a member named '%1'.").arg(name));
+        if (reportExisting) {
+            QMessageBox::critical(this,
+                                  tr("Error Adding Member"),
+                                  tr("There is already a member named '%1'.").arg(name));
+        }
         return;
     }
 

src/tiled/propertytypeseditor.h

@@ -116,7 +116,7 @@ class PropertyTypesEditor : public QDialog
 
     void openClassOfPopup();
     void openAddMemberDialog();
-    void addMember(const QString &name, const QVariant &value = QVariant());
+    void addMember(const QString &name, const QVariant &value, bool reportExisting);
     void removeMember();
     void renameSelectedMember();
     void renameMember(const QString &name);

tiled.qbs

@@ -6,7 +6,7 @@ Project {
     qbsSearchPaths: "qbs"
     minimumQbsVersion: "1.18"
 
-    property string version: Environment.getEnv("TILED_VERSION") || "1.11.2";
+    property string version: Environment.getEnv("TILED_VERSION") || "1.12.0";
     property bool snapshot: Environment.getEnv("TILED_SNAPSHOT") == "true"
     property bool release: Environment.getEnv("TILED_RELEASE") == "true"
     property string libDir: "lib"