From 3ef28c8a9d77ff71bfd4339076c54587ce87dabb Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@koefferlein.de>
Date: Sat, 4 Dec 2021 23:57:24 +0100
Subject: [PATCH 1/2] WIP: fixed some string extractors

---
 src/gsiqt/gsiqt.pro                            | 2 +-
 src/klayout.pri                                | 2 +-
 src/klayout_main/klayout_main/klayout_main.pro | 2 +-
 src/lay/lay/lay.pro                            | 2 +-
 src/laybasic/laybasic/laybasic.pro             | 2 +-
 src/lib_ut.pri                                 | 2 +-
 src/plugins/tools/view_25d/view_25d.pro        | 2 +-
 src/pymod/QtCore/QtCore.pro                    | 2 +-
 src/pymod/QtGui/QtGui.pro                      | 2 +-
 src/pymod/QtXml/QtXml.pro                      | 2 +-
 src/pymod/pymod.pro                            | 2 +-
 src/pymod/tl/tl.pro                            | 2 +-
 src/unit_tests/unit_tests.pro                  | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/gsiqt/gsiqt.pro b/src/gsiqt/gsiqt.pro
index a252b470f..8e0f734e4 100644
--- a/src/gsiqt/gsiqt.pro
+++ b/src/gsiqt/gsiqt.pro
@@ -2,7 +2,7 @@
 TEMPLATE = subdirs
 SUBDIRS = qtbasic 
 
-equals(HAVE_QT5, "1") {
+greaterThan(QT_MAJOR_VERSION, 4) {
   SUBDIRS += qt5
   qt5.depends += qtbasic
 } else {
diff --git a/src/klayout.pri b/src/klayout.pri
index 550c0cba7..01e08ba06 100644
--- a/src/klayout.pri
+++ b/src/klayout.pri
@@ -178,7 +178,7 @@ equals(HAVE_QT, "0") {
     }
   }
 
-  equals(HAVE_QT5, "1") {
+  greaterThan(QT_MAJOR_VERSION, 4) {
 
     QT += widgets gui printsupport xmlpatterns
 
diff --git a/src/klayout_main/klayout_main/klayout_main.pro b/src/klayout_main/klayout_main/klayout_main.pro
index 31ab7eb22..695f11e88 100644
--- a/src/klayout_main/klayout_main/klayout_main.pro
+++ b/src/klayout_main/klayout_main/klayout_main.pro
@@ -45,7 +45,7 @@ equals(HAVE_QTBINDINGS, "1") {
     LIBS += -lklayout_QtUiTools
   }
 
-  equals(HAVE_QT5, "1") {
+  greaterThan(QT_MAJOR_VERSION, 4) {
 
     LIBS += -lklayout_QtWidgets
 
diff --git a/src/lay/lay/lay.pro b/src/lay/lay/lay.pro
index 8a07f7da3..dea36e8e7 100644
--- a/src/lay/lay/lay.pro
+++ b/src/lay/lay/lay.pro
@@ -207,7 +207,7 @@ equals(HAVE_QTBINDINGS, "1") {
   !equals(HAVE_QT_XML, "0") {
     LIBS += -lklayout_QtXml
   }
-  equals(HAVE_QT5, "1") {
+  greaterThan(QT_MAJOR_VERSION, 4) {
     LIBS += -lklayout_QtWidgets
   }
 }
diff --git a/src/laybasic/laybasic/laybasic.pro b/src/laybasic/laybasic/laybasic.pro
index 5cf65cefe..309e33a20 100644
--- a/src/laybasic/laybasic/laybasic.pro
+++ b/src/laybasic/laybasic/laybasic.pro
@@ -310,7 +310,7 @@ DEPENDPATH += $$QTBASIC_INC
 
 equals(HAVE_QTBINDINGS, "1") {
   LIBS += -lklayout_qtbasic -lklayout_QtGui -lklayout_QtCore
-  equals(HAVE_QT5, "1") {
+  greaterThan(QT_MAJOR_VERSION, 4) {
     LIBS += -lklayout_QtWidgets
   }
 }
diff --git a/src/lib_ut.pri b/src/lib_ut.pri
index 92abe0854..e80c7ba32 100644
--- a/src/lib_ut.pri
+++ b/src/lib_ut.pri
@@ -17,7 +17,7 @@ win32 {
   QMAKE_POST_LINK += $(COPY) $(DESTDIR)$(TARGET) $$DESTDIR_UT/$${TARGET}.ut
 }
 
-equals(HAVE_QT5, "1") {
+greaterThan(QT_MAJOR_VERSION, 4) {
   QT += testlib
 } else {
   CONFIG += qtestlib
diff --git a/src/plugins/tools/view_25d/view_25d.pro b/src/plugins/tools/view_25d/view_25d.pro
index 3eb5a6fad..138f0890d 100644
--- a/src/plugins/tools/view_25d/view_25d.pro
+++ b/src/plugins/tools/view_25d/view_25d.pro
@@ -3,7 +3,7 @@ TEMPLATE = subdirs
 
 contains(QT_CONFIG, opengl) {
 
-  equals(HAVE_QT5, "1") {
+  greaterThan(QT_MAJOR_VERSION, 4) {
     SUBDIRS = lay_plugin unit_tests
   }
 
diff --git a/src/pymod/QtCore/QtCore.pro b/src/pymod/QtCore/QtCore.pro
index b45334bd4..9f7943d23 100644
--- a/src/pymod/QtCore/QtCore.pro
+++ b/src/pymod/QtCore/QtCore.pro
@@ -10,6 +10,6 @@ HEADERS += \
 
 LIBS += -lklayout_QtCore -lklayout_QtGui
 
-equals(HAVE_QT5, "1") {
+greaterThan(QT_MAJOR_VERSION, 4) {
   LIBS += -lklayout_QtWidgets
 }
diff --git a/src/pymod/QtGui/QtGui.pro b/src/pymod/QtGui/QtGui.pro
index a2f39a5bc..287a0a072 100644
--- a/src/pymod/QtGui/QtGui.pro
+++ b/src/pymod/QtGui/QtGui.pro
@@ -10,7 +10,7 @@ HEADERS += \
 
 LIBS += -lklayout_QtGui -lklayout_QtCore
 
-equals(HAVE_QT5, "1") {
+greaterThan(QT_MAJOR_VERSION, 4) {
   LIBS += -lklayout_QtWidgets
 }
 
diff --git a/src/pymod/QtXml/QtXml.pro b/src/pymod/QtXml/QtXml.pro
index a8641948a..0e178a75e 100644
--- a/src/pymod/QtXml/QtXml.pro
+++ b/src/pymod/QtXml/QtXml.pro
@@ -13,6 +13,6 @@ LIBS += -lklayout_QtCore -lklayout_QtXml
 # Because of stupid dependency of QtCore on QtGui and this on QtWidgets:
 LIBS += -lklayout_QtGui
 
-equals(HAVE_QT5, "1") {
+greaterThan(QT_MAJOR_VERSION, 4) {
   LIBS += -lklayout_QtWidgets
 }
diff --git a/src/pymod/pymod.pro b/src/pymod/pymod.pro
index 1b1998702..7b140159f 100644
--- a/src/pymod/pymod.pro
+++ b/src/pymod/pymod.pro
@@ -18,7 +18,7 @@ SUBDIRS = \
       QtCore \
       QtGui
 
-    equals(HAVE_QT5, "1") {
+    greaterThan(QT_MAJOR_VERSION, 4) {
 
       SUBDIRS += QtWidgets
 
diff --git a/src/pymod/tl/tl.pro b/src/pymod/tl/tl.pro
index 2ae8a8b1f..58219f4a0 100644
--- a/src/pymod/tl/tl.pro
+++ b/src/pymod/tl/tl.pro
@@ -12,7 +12,7 @@ HEADERS += \
 # Use this opportunity to provide the __init__.py file
 
 equals(HAVE_QTBINDINGS, "1") {
-  equals(HAVE_QT5, "1") {
+  greaterThan(QT_MAJOR_VERSION, 4) {
     INIT_PY = $$PWD/../__init__.py.qt5
   } else {
     INIT_PY = $$PWD/../__init__.py.qt4
diff --git a/src/unit_tests/unit_tests.pro b/src/unit_tests/unit_tests.pro
index 1676e614a..0e01149cb 100644
--- a/src/unit_tests/unit_tests.pro
+++ b/src/unit_tests/unit_tests.pro
@@ -37,7 +37,7 @@ LIBS += -lklayout_gsi_test
     !equals(HAVE_QT_XML, "0") {
       LIBS += -lklayout_QtXml
     }
-    equals(HAVE_QT5, "1") {
+    greaterThan(QT_MAJOR_VERSION, 4) {
       LIBS += -lklayout_QtWidgets
     }
   }

From 519d7f6353a022bdd0598cbe8de0a843437afd99 Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@koefferlein.de>
Date: Tue, 7 Dec 2021 23:40:26 +0100
Subject: [PATCH 2/2] Fixed issue #942 (plus: cleaned some config
 inconsistencies and fixed a small Ui flaw)

---
 .../lefdef/db_plugin/dbLEFDEFPlugin.cc        | 45 +++++++++++++------
 .../lay_plugin/layLEFDEFImportDialogs.cc      |  3 ++
 2 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc
index 35489ff1e..24f8383ea 100644
--- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc
+++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc
@@ -331,59 +331,75 @@ class LEFDEFFormatDeclaration
       tl::make_member (&LEFDEFReaderOptions::inst_property_name, &LEFDEFReaderOptions::set_inst_property_name, "inst-property-name") +
       tl::make_member (&LEFDEFReaderOptions::produce_pin_names, &LEFDEFReaderOptions::set_produce_pin_names, "produce-pin-names") +
       tl::make_member (&LEFDEFReaderOptions::pin_property_name, &LEFDEFReaderOptions::set_pin_property_name, "pin-property-name") +
+
       tl::make_member (&LEFDEFReaderOptions::produce_cell_outlines, &LEFDEFReaderOptions::set_produce_cell_outlines, "produce-cell-outlines") +
       tl::make_member (&LEFDEFReaderOptions::cell_outline_layer, &LEFDEFReaderOptions::set_cell_outline_layer, "cell-outline-layer") +
+
       tl::make_member (&LEFDEFReaderOptions::produce_placement_blockages, &LEFDEFReaderOptions::set_produce_placement_blockages, "produce-placement-blockages") +
       tl::make_member (&LEFDEFReaderOptions::placement_blockage_layer, &LEFDEFReaderOptions::set_placement_blockage_layer, "placement-blockage-layer") +
+
       tl::make_member (&LEFDEFReaderOptions::produce_regions, &LEFDEFReaderOptions::set_produce_regions, "produce-regions") +
       tl::make_member (&LEFDEFReaderOptions::region_layer, &LEFDEFReaderOptions::set_region_layer, "region-layer") +
+
       tl::make_member (&LEFDEFReaderOptions::produce_via_geometry, &LEFDEFReaderOptions::set_produce_via_geometry, "produce-via-geometry") +
       //  for backward compatibility
       tl::make_member (&LEFDEFReaderOptions::set_via_geometry_suffix, "special-via_geometry-suffix") +
       tl::make_member (&LEFDEFReaderOptions::set_via_geometry_datatype, "special-via_geometry-datatype") +
+      tl::make_member (&LEFDEFReaderOptions::set_via_geometry_suffix_str, "special-via_geometry-suffix-string") +
+      tl::make_member (&LEFDEFReaderOptions::set_via_geometry_datatype_str, "special-via_geometry-datatype-string") +
       //  new:
-      tl::make_member (&LEFDEFReaderOptions::via_geometry_suffix_str, &LEFDEFReaderOptions::set_via_geometry_suffix_str, "special-via_geometry-suffix-string") +
-      tl::make_member (&LEFDEFReaderOptions::via_geometry_datatype_str, &LEFDEFReaderOptions::set_via_geometry_datatype_str, "special-via_geometry-datatype-string") +
+      tl::make_member (&LEFDEFReaderOptions::via_geometry_suffix_str, &LEFDEFReaderOptions::set_via_geometry_suffix_str, "via_geometry-suffix-string") +
+      tl::make_member (&LEFDEFReaderOptions::via_geometry_datatype_str, &LEFDEFReaderOptions::set_via_geometry_datatype_str, "via_geometry-datatype-string") +
+
       tl::make_member (&LEFDEFReaderOptions::produce_pins, &LEFDEFReaderOptions::set_produce_pins, "produce-pins") +
       //  for backward compatibility
       tl::make_member (&LEFDEFReaderOptions::set_pins_suffix, "special-pins-suffix") +
       tl::make_member (&LEFDEFReaderOptions::set_pins_datatype, "special-pins-datatype") +
+      tl::make_member (&LEFDEFReaderOptions::set_pins_suffix_str, "special-pins-suffix-string") +
+      tl::make_member (&LEFDEFReaderOptions::set_pins_datatype_str, "special-pins-datatype-string") +
       //  new:
-      tl::make_member (&LEFDEFReaderOptions::pins_suffix_str, &LEFDEFReaderOptions::set_pins_suffix_str, "special-pins-suffix-string") +
-      tl::make_member (&LEFDEFReaderOptions::pins_datatype_str, &LEFDEFReaderOptions::set_pins_datatype_str, "special-pins-datatype-string") +
+      tl::make_member (&LEFDEFReaderOptions::pins_suffix_str, &LEFDEFReaderOptions::set_pins_suffix_str, "pins-suffix-string") +
+      tl::make_member (&LEFDEFReaderOptions::pins_datatype_str, &LEFDEFReaderOptions::set_pins_datatype_str, "pins-datatype-string") +
+
       tl::make_member (&LEFDEFReaderOptions::produce_lef_pins, &LEFDEFReaderOptions::set_produce_lef_pins, "produce-lef-pins") +
       //  for backward compatibility
       tl::make_member (&LEFDEFReaderOptions::set_lef_pins_suffix, "special-lef_pins-suffix") +
       tl::make_member (&LEFDEFReaderOptions::set_lef_pins_datatype, "special-lef_pins-datatype") +
+      tl::make_member (&LEFDEFReaderOptions::set_lef_pins_suffix_str, "special-lef_pins-suffix-string") +
+      tl::make_member (&LEFDEFReaderOptions::set_lef_pins_datatype_str, "special-lef_pins-datatype-string") +
       //  new:
-      tl::make_member (&LEFDEFReaderOptions::lef_pins_suffix_str, &LEFDEFReaderOptions::set_lef_pins_suffix_str, "special-lef_pins-suffix-string") +
-      tl::make_member (&LEFDEFReaderOptions::lef_pins_datatype_str, &LEFDEFReaderOptions::set_lef_pins_datatype_str, "special-lef_pins-datatype-string") +
+      tl::make_member (&LEFDEFReaderOptions::lef_pins_suffix_str, &LEFDEFReaderOptions::set_lef_pins_suffix_str, "lef_pins-suffix-string") +
+      tl::make_member (&LEFDEFReaderOptions::lef_pins_datatype_str, &LEFDEFReaderOptions::set_lef_pins_datatype_str, "lef_pins-datatype-string") +
+
       tl::make_member (&LEFDEFReaderOptions::produce_fills, &LEFDEFReaderOptions::set_produce_fills, "produce-fills") +
       //  for backward compatibility
       tl::make_member (&LEFDEFReaderOptions::set_fills_suffix, "special-fills-suffix") +
       tl::make_member (&LEFDEFReaderOptions::set_fills_datatype, "special-fills-datatype") +
+      tl::make_member (&LEFDEFReaderOptions::set_fills_suffix_str, "special-fills-suffix-string") +
+      tl::make_member (&LEFDEFReaderOptions::set_fills_datatype_str, "special-fills-datatype-string") +
       //  new:
-      tl::make_member (&LEFDEFReaderOptions::fills_suffix_str, &LEFDEFReaderOptions::set_fills_suffix_str, "special-fills-suffix-string") +
-      tl::make_member (&LEFDEFReaderOptions::fills_datatype_str, &LEFDEFReaderOptions::set_fills_datatype_str, "special-fills-datatype-string") +
+      tl::make_member (&LEFDEFReaderOptions::fills_suffix_str, &LEFDEFReaderOptions::set_fills_suffix_str, "fills-suffix-string") +
+      tl::make_member (&LEFDEFReaderOptions::fills_datatype_str, &LEFDEFReaderOptions::set_fills_datatype_str, "fills-datatype-string") +
+
       tl::make_member (&LEFDEFReaderOptions::produce_obstructions, &LEFDEFReaderOptions::set_produce_obstructions, "produce-obstructions") +
       tl::make_member (&LEFDEFReaderOptions::obstructions_suffix, &LEFDEFReaderOptions::set_obstructions_suffix, "obstructions-suffix") +
       tl::make_member (&LEFDEFReaderOptions::obstructions_datatype, &LEFDEFReaderOptions::set_obstructions_datatype, "obstructions-datatype") +
+
       tl::make_member (&LEFDEFReaderOptions::produce_blockages, &LEFDEFReaderOptions::set_produce_blockages, "produce-blockages") +
       tl::make_member (&LEFDEFReaderOptions::blockages_suffix, &LEFDEFReaderOptions::set_blockages_suffix, "blockages-suffix") +
       tl::make_member (&LEFDEFReaderOptions::blockages_datatype, &LEFDEFReaderOptions::set_blockages_datatype, "blockages-datatype") +
+
       tl::make_member (&LEFDEFReaderOptions::produce_labels, &LEFDEFReaderOptions::set_produce_labels, "produce-labels") +
       tl::make_member (&LEFDEFReaderOptions::labels_suffix, &LEFDEFReaderOptions::set_labels_suffix, "labels-suffix") +
       tl::make_member (&LEFDEFReaderOptions::labels_datatype, &LEFDEFReaderOptions::set_labels_datatype, "labels-datatype") +
       tl::make_member (&LEFDEFReaderOptions::produce_lef_labels, &LEFDEFReaderOptions::set_produce_lef_labels, "produce-lef-labels") +
       tl::make_member (&LEFDEFReaderOptions::lef_labels_suffix, &LEFDEFReaderOptions::set_lef_labels_suffix, "lef-labels-suffix") +
       tl::make_member (&LEFDEFReaderOptions::lef_labels_datatype, &LEFDEFReaderOptions::set_lef_labels_datatype, "lef-labels-datatype") +
+
       tl::make_member (&LEFDEFReaderOptions::produce_routing, &LEFDEFReaderOptions::set_produce_routing, "produce-routing") +
-      //  for backward compatibility
-      tl::make_member (&LEFDEFReaderOptions::set_routing_suffix, "special-routing-suffix") +
-      tl::make_member (&LEFDEFReaderOptions::set_routing_datatype, "special-routing-datatype") +
-      //  new:
-      tl::make_member (&LEFDEFReaderOptions::routing_suffix_str, &LEFDEFReaderOptions::set_routing_suffix_str, "special-routing-suffix-string") +
-      tl::make_member (&LEFDEFReaderOptions::routing_datatype_str, &LEFDEFReaderOptions::set_routing_datatype_str, "special-routing-datatype-string") +
+      tl::make_member (&LEFDEFReaderOptions::routing_suffix_str, &LEFDEFReaderOptions::set_routing_suffix_str, "routing-suffix-string") +
+      tl::make_member (&LEFDEFReaderOptions::routing_datatype_str, &LEFDEFReaderOptions::set_routing_datatype_str, "routing-datatype-string") +
+
       tl::make_member (&LEFDEFReaderOptions::produce_special_routing, &LEFDEFReaderOptions::set_produce_special_routing, "produce-special-routing") +
       //  for backward compatibility
       tl::make_member (&LEFDEFReaderOptions::set_special_routing_suffix, "special-routing-suffix") +
@@ -391,6 +407,7 @@ class LEFDEFFormatDeclaration
       //  new:
       tl::make_member (&LEFDEFReaderOptions::special_routing_suffix_str, &LEFDEFReaderOptions::set_special_routing_suffix_str, "special-routing-suffix-string") +
       tl::make_member (&LEFDEFReaderOptions::special_routing_datatype_str, &LEFDEFReaderOptions::set_special_routing_datatype_str, "special-routing-datatype-string") +
+
       tl::make_member (&LEFDEFReaderOptions::via_cellname_prefix, &LEFDEFReaderOptions::set_via_cellname_prefix, "via-cellname-prefix") +
       tl::make_member (&LEFDEFReaderOptions::begin_lef_files, &LEFDEFReaderOptions::end_lef_files, &LEFDEFReaderOptions::push_lef_file, "lef-files") +
       tl::make_member (&LEFDEFReaderOptions::begin_macro_layout_files, &LEFDEFReaderOptions::end_macro_layout_files, &LEFDEFReaderOptions::push_macro_layout_file, "macro_layout-files") +
diff --git a/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.cc b/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.cc
index 744dab2f0..4badeb7e9 100644
--- a/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.cc
+++ b/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImportDialogs.cc
@@ -360,6 +360,7 @@ LEFDEFReaderOptionsEditor::LEFDEFReaderOptionsEditor (QWidget *parent)
   connect (produce_routing, SIGNAL (stateChanged (int)), this, SLOT (checkbox_changed ()));
   connect (produce_special_routing, SIGNAL (stateChanged (int)), this, SLOT (checkbox_changed ()));
   connect (produce_labels, SIGNAL (stateChanged (int)), this, SLOT (checkbox_changed ()));
+  connect (produce_lef_labels, SIGNAL (stateChanged (int)), this, SLOT (checkbox_changed ()));
   connect (add_lef_file, SIGNAL (clicked ()), this, SLOT (add_lef_file_clicked ()));
   connect (del_lef_files, SIGNAL (clicked ()), this, SLOT (del_lef_files_clicked ()));
   connect (move_lef_files_up, SIGNAL (clicked ()), this, SLOT (move_lef_files_up_clicked ()));
@@ -644,6 +645,7 @@ LEFDEFReaderOptionsEditor::checkbox_changed ()
   suffix_routing->setEnabled (produce_routing->isChecked ());
   suffix_special_routing->setEnabled (produce_special_routing->isChecked ());
   suffix_labels->setEnabled (produce_labels->isChecked ());
+  suffix_lef_labels->setEnabled (produce_lef_labels->isChecked ());
   datatype_via_geometry->setEnabled (produce_via_geometry->isChecked ());
   datatype_pins->setEnabled (produce_pins->isChecked ());
   datatype_lef_pins->setEnabled (produce_lef_pins->isChecked ());
@@ -653,6 +655,7 @@ LEFDEFReaderOptionsEditor::checkbox_changed ()
   datatype_routing->setEnabled (produce_routing->isChecked ());
   datatype_special_routing->setEnabled (produce_special_routing->isChecked ());
   datatype_labels->setEnabled (produce_labels->isChecked ());
+  datatype_lef_labels->setEnabled (produce_lef_labels->isChecked ());
 }
 
 void