Skip to content

Commit

Permalink
Link to QtSvg
Browse files Browse the repository at this point in the history
Tiled needs QtSvg to be present since some of the icons use the SVG
format. Directly depending on its ensures it will be available.

It technically doesn't need to link to this library, since it should get
loaded through the SVG icon engine plugin, but doing so ensures that
macdeployqt will reliably copy over the SVG icon engine and image format
plugins.
  • Loading branch information
bjorn committed May 17, 2022
1 parent b81f92b commit ce441e1
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu-20.04.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- name: Install dependencies
run: |
sudo apt update
sudo apt install qtbase5-dev qttools5-dev-tools zlib1g-dev qtdeclarative5-dev qtdeclarative5-private-dev qtbase5-private-dev qbs python3-dev
sudo apt install qtbase5-dev libqt5svg5-dev qttools5-dev-tools zlib1g-dev qtdeclarative5-dev qtdeclarative5-private-dev qtbase5-private-dev qbs python3-dev
- name: Setup qbs
run: |
Expand Down
1 change: 1 addition & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
* Fixed removal of terrain info when removing tiles from a collection
* Scripting: Fixed region.rects when compiled against Qt 5.9 to 5.13
* Scripting: Layer.tintColor is now #ffffff when not set
* macOS: Enabled support for loading SVGs
* macOS: Show shortcuts in context menus when using Tiled Fusion style (#1978)
* AppImage: Updated to Sentry 0.4.17

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Compiling
Before you can compile Tiled, you must ensure the Qt (>= 5.6) development
libraries have been installed as well as the Qbs build tool:

* On Ubuntu/Debian: `sudo apt install qtbase5-dev libqt5svg5 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 qtdeclarative5-private-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/):
Expand Down
2 changes: 1 addition & 1 deletion src/tiled/tiled.qbs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ QtGuiApplication {
Depends { name: "qtpropertybrowser" }
Depends { name: "qtsingleapplication" }
Depends { name: "ib"; condition: qbs.targetOS.contains("macos") }
Depends { name: "Qt"; submodules: ["core", "widgets", "qml", "qml-private"]; versionAtLeast: "5.6" }
Depends { name: "Qt"; submodules: ["core", "widgets", "qml", "qml-private", "svg"]; versionAtLeast: "5.6" }
Depends { name: "Qt.openglwidgets"; condition: Qt.core.versionMajor >= 6 }
Depends { name: "Qt.dbus"; condition: qbs.targetOS.contains("linux") && project.dbus; required: false }
Depends { name: "Qt.gui-private"; condition: qbs.targetOS.contains("windows") && Qt.core.versionMajor >= 6 }
Expand Down

0 comments on commit ce441e1

Please sign in to comment.