From 156b9137ab0bc9ad705d1a688e03bc9129a5ac51 Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@koefferlein.de>
Date: Mon, 7 Mar 2022 21:53:55 +0100
Subject: [PATCH] Build patch to allow building without qxmlpattern with
 -without-qt-xml

---
 src/gsiqt/qt5/QtCore/gsiDeclQtCoreAdd.cc |  1 -
 src/klayout.pri                          | 10 ++++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/gsiqt/qt5/QtCore/gsiDeclQtCoreAdd.cc b/src/gsiqt/qt5/QtCore/gsiDeclQtCoreAdd.cc
index c534efbc4..6954d7252 100644
--- a/src/gsiqt/qt5/QtCore/gsiDeclQtCoreAdd.cc
+++ b/src/gsiqt/qt5/QtCore/gsiDeclQtCoreAdd.cc
@@ -28,7 +28,6 @@
 #include <QPoint>
 #include <QColor>
 #include <QSize>
-#include <QAbstractMessageHandler>
 
 //  NOTE: this is required because HitTestAccuracy is defined here, but goes into Qt
 //  namespace which is in QtCore ... this introduces a dependency of QtCore GSI lib on QtGui.
diff --git a/src/klayout.pri b/src/klayout.pri
index 5dcc9b30f..f3fcea4ef 100644
--- a/src/klayout.pri
+++ b/src/klayout.pri
@@ -186,10 +186,6 @@ equals(HAVE_QT, "0") {
 
     QT += widgets gui printsupport
 
-    lessThan(QT_MAJOR_VERSION, 6) {
-      QT += xmlpatterns
-    }
-
     equals(HAVE_QTBINDINGS, "1") {
       !equals(HAVE_QT_DESIGNER, "0") {
         # designer isn't needed by the base application
@@ -207,6 +203,12 @@ equals(HAVE_QT, "0") {
         # uitools isn't needed by the base application
         QT += uitools
       }
+      !equals(HAVE_QT_XML, "0") {
+        lessThan(QT_MAJOR_VERSION, 6) {
+          QT += xmlpatterns
+        }
+      }
+
     }
 
   } else {