From 02d67494f9f33cd6a9de955ad577b6958b875483 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= <bjorn@lindeijer.nl>
Date: Fri, 13 Jan 2023 14:46:56 +0100
Subject: [PATCH] Qbs: Use pkg-config to depend on zlib

This way we should support building Tiled with zlib in some strange
location, like on NixOS.

To support this on the latest version of Qbs, we need to set
Project.qbsModuleProviders since it no longer falls back on pkg-config
by default. Since this property was introduced in Qbs 1.21, this becomes
the minimum Qbs version.
---
 src/libtiled/libtiled.qbs | 7 ++++---
 tiled.qbs                 | 6 ++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/libtiled/libtiled.qbs b/src/libtiled/libtiled.qbs
index 6dda343a71..aba37cfa14 100644
--- a/src/libtiled/libtiled.qbs
+++ b/src/libtiled/libtiled.qbs
@@ -6,6 +6,10 @@ DynamicLibrary {
 
     Depends { name: "cpp" }
     Depends { name: "Qt"; submodules: "gui"; versionAtLeast: "5.12" }
+    Depends {
+        condition: !qbs.toolchain.contains("msvc")
+        name: "zlib"
+    }
 
     Probes.PkgConfigProbe {
         id: pkgConfigZstd
@@ -46,9 +50,6 @@ DynamicLibrary {
     cpp.dynamicLibraries: {
         var libs = base;
 
-        if (!qbs.toolchain.contains("msvc"))
-            libs.push("z");
-
         if (pkgConfigZstd.found && !project.staticZstd)
             libs = libs.concat(pkgConfigZstd.libraries);
 
diff --git a/tiled.qbs b/tiled.qbs
index c8d5018d41..9e401afa0f 100644
--- a/tiled.qbs
+++ b/tiled.qbs
@@ -3,8 +3,10 @@ import qbs.Environment
 Project {
     name: "Tiled"
 
-    qbsSearchPaths: "qbs"
-    minimumQbsVersion: "1.13"
+    minimumQbsVersion: "1.21"
+
+    qbsModuleProviders: ["Qt", "qbspkgconfig"]
+    qbsSearchPaths: ["qbs"]
 
     property string version: Environment.getEnv("TILED_VERSION") || "1.11.0";
     property bool snapshot: Environment.getEnv("TILED_SNAPSHOT") == "true"