From 0bad7efb0d1ce81edb42bf0193f311c67c780862 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Sat, 30 Oct 2021 14:02:31 +0000
Subject: Fix build with QuaZip-1.0


diff --git a/texstudio.pro b/texstudio.pro
index 05831aa..60d8798 100644
--- a/texstudio.pro
+++ b/texstudio.pro
@@ -381,11 +381,9 @@ include(src/symbolpanel/symbolpanel.pri)
 isEmpty(USE_SYSTEM_QUAZIP) {
     include(src/quazip/quazip/quazip.pri)
 } else {
-        message(System quazip5)
-        isEmpty(QUAZIP_LIB): QUAZIP_LIB = -lquazip5
-        isEmpty(QUAZIP_INCLUDE): QUAZIP_INCLUDE = $${PREFIX}/include/quazip5
-        INCLUDEPATH += $${QUAZIP_INCLUDE}
-        LIBS += $${QUAZIP_LIB}
+        message(System QuaZip)
+        CONFIG += link_pkgconfig
+        PKGCONFIG += quazip1-qt5
 }
 
 include(src/pdfviewer/pdfviewer.pri)
-- 
2.30.2


From 46d2c521a2a8fcdd71878778026fe2d91f9926b2 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Sun, 30 Jan 2022 08:27:46 +0000
Subject: Don't include xkb for Haiku


diff --git a/texstudio.pro b/texstudio.pro
index 60d8798..4ba9ed1 100644
--- a/texstudio.pro
+++ b/texstudio.pro
@@ -196,7 +196,9 @@ unix:!macx {
     }
     INSTALLS += applicationmenu
     INSTALLS += icon
+!haiku {
     include(src/xkb/xkb.pri)
+    }
 }
 
 # ##########UNIX + MACX###############
-- 
2.30.2


From f80b194fe346aaeed460836dcdf24afeeac61964 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Sun, 30 Jan 2022 14:32:02 +0000
Subject: Don't define WS_X11 for Haiku


diff --git a/src/bidiextender.cpp b/src/bidiextender.cpp
index 0e3794e..9dd55e1 100644
--- a/src/bidiextender.cpp
+++ b/src/bidiextender.cpp
@@ -4,7 +4,7 @@
 
 //mostly taken from biditexmaker
 
-#if defined( Q_OS_LINUX ) || ( defined( Q_OS_UNIX ) && !defined( Q_OS_MAC ) )
+#if defined( Q_OS_LINUX ) || ( defined( Q_OS_UNIX ) && !defined( Q_OS_MAC ) && !defined( Q_OS_HAIKU ) )
 #define WS_X11
 #endif
 
-- 
2.30.2

