From 8c4d76505ccc3071dab2e65827afe0005a9d660f Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@koefferlein.de>
Date: Fri, 26 Feb 2021 23:03:07 +0100
Subject: [PATCH] More patches for uitools-less build for CentOS 8

---
 src/gsiqt/qtbasic/gsiQtUiToolsExternals.h | 4 +++-
 src/klayout_main/klayout_main/klayout.cc  | 5 +----
 src/pymod/QtUiTools/QtUiTools.pro         | 7 ++++---
 src/pymod/unit_tests/pymod_tests.cc       | 5 +++++
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/gsiqt/qtbasic/gsiQtUiToolsExternals.h b/src/gsiqt/qtbasic/gsiQtUiToolsExternals.h
index 341ff42d5..49462cbed 100644
--- a/src/gsiqt/qtbasic/gsiQtUiToolsExternals.h
+++ b/src/gsiqt/qtbasic/gsiQtUiToolsExternals.h
@@ -20,7 +20,9 @@
 
 */
 
-#if QT_VERSION >= 0x050000
+#if !defined(HAVE_QT_UITOOLS)
+#  defined FORCE_LINK_GSI_QTUITOOLS
+#elif QT_VERSION >= 0x050000
 #  include "../qt5/QtUiTools/gsiQtExternals.h"
 #else
 #  include "../qt4/QtUiTools/gsiQtExternals.h"
diff --git a/src/klayout_main/klayout_main/klayout.cc b/src/klayout_main/klayout_main/klayout.cc
index 976963b9d..8091c7196 100644
--- a/src/klayout_main/klayout_main/klayout.cc
+++ b/src/klayout_main/klayout_main/klayout.cc
@@ -61,6 +61,7 @@
 # include "gsiQtSvgExternals.h"
 # include "gsiQtNetworkExternals.h"
 # include "gsiQtDesignerExternals.h"
+# include "gsiQtUiToolsExternals.h"
 
 FORCE_LINK_GSI_QTCORE
 FORCE_LINK_GSI_QTGUI
@@ -73,11 +74,7 @@ FORCE_LINK_GSI_QTDESIGNER
 FORCE_LINK_GSI_QTNETWORK
 FORCE_LINK_GSI_QTSQL
 FORCE_LINK_GSI_QTSVG
-
-#if defined(HAVE_QT_UITOOLS)
-#  include "gsiQtUiToolsExternals.h"
 FORCE_LINK_GSI_QTUITOOLS
-#endif
 
 #else
 # define QT_EXTERNAL_BASE(x)
diff --git a/src/pymod/QtUiTools/QtUiTools.pro b/src/pymod/QtUiTools/QtUiTools.pro
index 4bf43b588..200791fd3 100644
--- a/src/pymod/QtUiTools/QtUiTools.pro
+++ b/src/pymod/QtUiTools/QtUiTools.pro
@@ -8,8 +8,9 @@ SOURCES = \
 
 HEADERS += \
 
-LIBS += -lklayout_QtUiTools 
-
 contains(QT_MODULES, uitools) {
-  LIBS += -lklayout_QtCore
+  LIBS += -lklayout_QtUiTools 
 }
+
+LIBS += -lklayout_QtCore
+
diff --git a/src/pymod/unit_tests/pymod_tests.cc b/src/pymod/unit_tests/pymod_tests.cc
index 16de70c82..9812fa666 100644
--- a/src/pymod/unit_tests/pymod_tests.cc
+++ b/src/pymod/unit_tests/pymod_tests.cc
@@ -98,8 +98,13 @@ PYMODTEST (import_QtXml, "import_QtXml.py")
 PYMODTEST (import_QtSql, "import_QtSql.py")
 PYMODTEST (import_QtNetwork, "import_QtNetwork.py")
 PYMODTEST (import_QtDesigner, "import_QtDesigner.py")
+
+#if defined(HAVE_QT_UITOOLS)
+
 PYMODTEST (import_QtUiTools, "import_QtUiTools.py")
 
+#endif
+
 #if QT_VERSION >= 0x50000
 
 PYMODTEST (import_QtWidgets, "import_QtWidgets.py")