Fixed compilation against Qt 5

mapeditor · Jul 14, 2024 · 1cb3583 · 1cb3583
1 parent f13393d
commit 1cb3583
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/src/libtiled/properties.h b/src/libtiled/properties.h
@@ -91,7 +91,7 @@ class TILEDSHARED_EXPORT ObjectRef
     Q_PROPERTY(int id MEMBER id)
 
 public:
-    int id;
+    int id = 0;
 
     bool operator==(const ObjectRef &o) const
     { return id == o.id; }

diff --git a/src/tiled/custompropertieshelper.cpp b/src/tiled/custompropertieshelper.cpp
@@ -292,7 +292,12 @@ void CustomPropertiesHelper::onValueChanged(QtProperty *property, const QVariant
             }
         }
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
         subProperties.resize(values.size(), nullptr);
+#else
+        while (subProperties.size() < values.size())
+            subProperties.append(nullptr);
+#endif
 
         // Set sub-property values, creating them if necessary
         for (int i = 0; i < values.size(); ++i) {

diff --git a/src/tiled/listedit.cpp b/src/tiled/listedit.cpp
@@ -85,7 +85,11 @@ void ListEdit::addButtonClicked()
     if (mValue.isEmpty())
         return mAddButton->showMenu();
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
     mValue.append(QVariant(mValue.last().metaType()));
+#else
+    mValue.append(QVariant(mValue.last().userType(), nullptr));
+#endif
     emit valueChanged(mValue);
 }
 

diff --git a/src/tiled/listedit.h b/src/tiled/listedit.h
@@ -23,6 +23,7 @@
 #include <QWidget>
 
 class QLabel;
+class QMenu;
 class QToolButton;
 
 namespace Tiled {