Try if we can remove qtdeclarative5-private-dev as well

Might still be needed, because it was added before the use of Qt.qml-private.
bjorn · Nov 16, 2023 · d9e222d · d9e222d
1 parent 3a33807
commit d9e222d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -44,7 +44,7 @@ jobs:
     - name: Install dependencies
       run: |
         sudo apt update
-        sudo apt install qtbase5-dev libqt5svg5-dev qttools5-dev-tools zlib1g-dev qtdeclarative5-dev qtdeclarative5-private-dev qbs python3-dev
+        sudo apt install qtbase5-dev libqt5svg5-dev qttools5-dev-tools zlib1g-dev qtdeclarative5-dev qbs python3-dev
 
     - name: Setup qbs
       run: |

diff --git a/.github/workflows/ubuntu-22.04.yml b/.github/workflows/ubuntu-22.04.yml
@@ -32,7 +32,7 @@ jobs:
     - name: Install dependencies
       run: |
         sudo apt update
-        sudo apt install qtbase5-dev libqt5svg5-dev qttools5-dev-tools zlib1g-dev qtdeclarative5-dev qtdeclarative5-private-dev qbs python3-dev
+        sudo apt install qtbase5-dev libqt5svg5-dev qttools5-dev-tools zlib1g-dev qtdeclarative5-dev qbs python3-dev
 
     - name: Setup qbs
       run: |

diff --git a/README.md b/README.md
@@ -45,7 +45,7 @@ Compiling Tiled
 Before you can compile Tiled, you must ensure the Qt (>= 5.12) development
 libraries have been installed as well as the Qbs build tool:
 
-* On Ubuntu/Debian: `sudo apt install qtbase5-dev libqt5svg5-dev qttools5-dev-tools zlib1g-dev qtdeclarative5-dev qtdeclarative5-private-dev qbs`
+* On Ubuntu/Debian: `sudo apt install qtbase5-dev libqt5svg5-dev qttools5-dev-tools zlib1g-dev qtdeclarative5-dev qbs`
 * On Fedora:        `sudo dnf builddep tiled`
 * On Arch Linux:    `sudo pacman -S qt qt5-tools qbs`
 * On macOS with [Homebrew](https://brew.sh/):

diff --git a/src/tiled/editabletilelayer.cpp b/src/tiled/editabletilelayer.cpp
@@ -29,6 +29,8 @@
 #include "tilelayeredit.h"
 #include "tilelayerwangedit.h"
 
+static int EditableTileLayer_instances = 0;
+
 namespace Tiled {
 
 EditableTileLayer::EditableTileLayer(const QString &name, QSize size, QObject *parent)
@@ -46,10 +48,12 @@ EditableTileLayer::EditableTileLayer(EditableMap *map,
                                      QObject *parent)
     : EditableLayer(map, layer, parent)
 {
+    qDebug() << Q_FUNC_INFO << layer->name() << ++EditableTileLayer_instances;
 }
 
 EditableTileLayer::~EditableTileLayer()
 {
+    qDebug() << Q_FUNC_INFO << layer()->name() << --EditableTileLayer_instances;
     while (!mActiveEdits.isEmpty())
         delete mActiveEdits.first();
     while (!mActiveWangEdits.isEmpty())