From 684ece41d1de92e9eb1ddefb4cf51638a829fc25 Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@koefferlein.de>
Date: Sat, 14 May 2022 00:00:35 +0200
Subject: [PATCH] Fixed qmake-based builds after changing setup.py

---
 src/ant/ant/ant.pro                 |  2 ++
 src/edt/edt/edt.pro                 |  2 ++
 src/lym/lym/lym.pro                 |  2 ++
 src/pymod/lay/lay.pro               | 12 ++++++++++--
 src/pymod/pymod.pro                 |  4 ----
 src/pymod/unit_tests/pymod_tests.cc | 10 +++++-----
 6 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/ant/ant/ant.pro b/src/ant/ant/ant.pro
index 079b34e75..7a5a1705c 100644
--- a/src/ant/ant/ant.pro
+++ b/src/ant/ant/ant.pro
@@ -30,6 +30,7 @@ SOURCES = \
 # Enabled without Qt:
 
 HEADERS += \
+  antForceLink.h \
   antConfig.h \
   antObject.h \
   antPlugin.h \
@@ -39,6 +40,7 @@ HEADERS += \
   antCommon.h
 
 SOURCES += \
+  antForceLink.cc \
   antConfig.cc \
   antObject.cc \
   antPlugin.cc \
diff --git a/src/edt/edt/edt.pro b/src/edt/edt/edt.pro
index 5e4b7a3fe..087503794 100644
--- a/src/edt/edt/edt.pro
+++ b/src/edt/edt/edt.pro
@@ -54,6 +54,7 @@ SOURCES = \
 # Enabled without Qt:
 
 HEADERS += \
+  edtForceLink.h \
   edtConfig.h \
   edtMainService.h \
   edtPartialService.h \
@@ -65,6 +66,7 @@ HEADERS += \
   edtDistribute.h \
 
 SOURCES += \
+  edtForceLink.cc \
   edtConfig.cc \
   edtMainService.cc \
   edtPartialService.cc \
diff --git a/src/lym/lym/lym.pro b/src/lym/lym/lym.pro
index 9a87d4c8b..0284fb201 100644
--- a/src/lym/lym/lym.pro
+++ b/src/lym/lym/lym.pro
@@ -8,12 +8,14 @@ DEFINES += MAKE_LYM_LIBRARY
 
 SOURCES = \
   gsiDeclLymMacro.cc \
+  lymForceLink.cc \
   lymMacroInterpreter.cc \
   lymMacroCollection.cc \
   lymMacro.cc \
 
 HEADERS = \
   lymCommon.h \
+  lymForceLink.h \
   lymInclude.h \
   lymMacroInterpreter.h \
   lymMacroCollection.h \
diff --git a/src/pymod/lay/lay.pro b/src/pymod/lay/lay.pro
index 5555294e0..789393308 100644
--- a/src/pymod/lay/lay.pro
+++ b/src/pymod/lay/lay.pro
@@ -1,5 +1,6 @@
 
-TARGET = lay
+TARGET = laycore
+REALMODULE = lay
 
 include($$PWD/../pymod.pri)
 
@@ -8,5 +9,12 @@ SOURCES = \
 
 HEADERS += \
 
-LIBS += -lklayout_lay
+equals(HAVE_QT, "0") {
+  LIBS += -lklayout_laybasic
+} else {
+  LIBS += -lklayout_lay
+}
+
+# hard linked as they contribute GSI classes to "lay" module:
+LIBS += -lklayout_img -lklayout_edt -lklayout_ant -lklayout_lym
 
diff --git a/src/pymod/pymod.pro b/src/pymod/pymod.pro
index 5b2debe92..b8f7744ea 100644
--- a/src/pymod/pymod.pro
+++ b/src/pymod/pymod.pro
@@ -8,10 +8,6 @@ SUBDIRS = \
   rdb \
   lib \
   lay \
-  lym \
-  ant \
-  edt \
-  img \
 
 !equals(HAVE_QT, "0") {
 
diff --git a/src/pymod/unit_tests/pymod_tests.cc b/src/pymod/unit_tests/pymod_tests.cc
index 441bcae6d..8f4b352f9 100644
--- a/src/pymod/unit_tests/pymod_tests.cc
+++ b/src/pymod/unit_tests/pymod_tests.cc
@@ -89,8 +89,12 @@ PYMODTEST (import_db, "import_db.py")
 PYMODTEST (import_rdb, "import_rdb.py")
 
 #if defined(HAVE_QT) && defined(HAVE_QTBINDINGS)
-
 PYMODTEST (import_lay, "import_lay.py")
+#else
+PYMODTEST (import_lay, "import_lay_noqt.py")
+#endif
+
+#if defined(HAVE_QT) && defined(HAVE_QTBINDINGS)
 
 PYMODTEST (import_QtCore, "import_QtCore.py")
 #if QT_VERSION >= 0x60000
@@ -146,8 +150,4 @@ PYMODTEST (import_QtCore5Compat, "import_QtCore5Compat.py")
 
 PYMODTEST (import_pya, "pya_tests.py")
 
-#elif defined(HAVE_QT)
-
-PYMODTEST (import_lay, "import_lay_noqt.py")
-
 #endif