From ce3da6238f4dd80ed008d385631bbbfe8d7b280a Mon Sep 17 00:00:00 2001
From: Dominik Riebeling <Dominik.Riebeling@gmail.com>
Date: Wed, 21 Oct 2020 21:31:13 +0200
Subject: rbutil: Fix linking zlib on Windows.

With Qt4 zlib was linked implicitly (and explicitly linking it caused
errors). This was a Qt issue that has been resolved with (at least
current) Qt5, now we need to explicitly link zlib on native Windows.

Change-Id: Ia5a6bdc83a39f6f5629c34ed835d2272a887f161
---
 rbutil/rbutilqt/rbutilqt.pro | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'rbutil/rbutilqt')

diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro
index a7d0a179e6..b3516f796b 100644
--- a/rbutil/rbutilqt/rbutilqt.pro
+++ b/rbutil/rbutilqt/rbutilqt.pro
@@ -146,10 +146,7 @@ for(rblib, RBLIBS) {
     LIBS += -l$$rblib
 }
 
-# on win32 libz is linked implicitly.
-!win32 {
-    LIBS += -lz
-}
+LIBS += -lz
 
 # Add a (possibly found) libspeex now, don't do this before -lrbspeex!
 !static:!isEmpty(LIBSPEEX) {
-- 
cgit