WIP: some fixes at unit test level

src/pymod/lay/lay.pro

@@ -9,12 +9,13 @@ SOURCES = \
 
 HEADERS += \
 
-equals(HAVE_QT, "0") {
-  LIBS += -lklayout_laybasic
-} else {
+LIBS += -lklayout_layview
+
+!equals(HAVE_QT, "0") {
+  LIBS += -lklayout_layui
   LIBS += -lklayout_lay
 }
 
 # hard linked as they contribute GSI classes to "lay" module:
-LIBS += -lklayout_img -lklayout_edt -lklayout_ant -lklayout_lym
+LIBS += -lklayout_laybasic -lklayout_img -lklayout_edt -lklayout_ant -lklayout_lym
 

src/pymod/lay/layMain.cc

@@ -23,7 +23,11 @@
 #include "../pymodHelper.h"
 
 //  to force linking of the layview module
+#if defined(HAVE_QT)
+#  include "../../lay/lay/layForceLink.h"
+#else
 #  include "../../layview/layview/layviewForceLink.h"
+#endif
 
 //  Force-include other dependencies
 //  NOTE: these libraries contribute to the "lay" module space. Hence we have to include them.
@@ -33,4 +37,3 @@
 #include "../../lym/lym/lymForceLink.h"
 
 DEFINE_PYMOD(laycore, "lay", "KLayout core module 'lay'")
-

src/pymod/unit_tests/pymod_tests.cc

@@ -87,12 +87,7 @@ PYMODTEST (bridge, "bridge.py")
 PYMODTEST (import_tl, "import_tl.py")
 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)