From ca15d9ec9de1fdf68a1dab152cc5fcba14ee83af Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Mon, 18 Oct 2021 00:12:46 +0200 Subject: [PATCH] WIP --- build.bat | 1 - build.sh | 34 +------------------ src/fontgen/fontgen.cc | 2 +- src/gsiqt/gsiqt.pro | 2 +- src/klayout.pri | 2 +- .../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 +- 16 files changed, 15 insertions(+), 48 deletions(-) diff --git a/build.bat b/build.bat index ff447e272..fe99b4961 100644 --- a/build.bat +++ b/build.bat @@ -256,7 +256,6 @@ if not exist "%option-build%" ( echo on "%option-qmake%" ^ - HAVE_QT5=1 ^ HAVE_QT_UITOOLS=1 ^ HAVE_QT_NETWORK=1 ^ HAVE_QT_SQL=1 ^ diff --git a/build.sh b/build.sh index 79555a24f..d33ef34c2 100755 --- a/build.sh +++ b/build.sh @@ -36,7 +36,6 @@ HAVE_QT_DESIGNER=1 HAVE_QT_XML=1 HAVE_64BIT_COORD=0 HAVE_QT=1 -HAVE_QT5="" # not set HAVE_CURL=0 HAVE_EXPAT=0 @@ -197,12 +196,6 @@ while [ "$*" != "" ]; do RPATH="$1" shift ;; - -qt4) - HAVE_QT5=0 - ;; - -qt5) - HAVE_QT5=1 - ;; -dry-run) RUN_MAKE=0 ;; @@ -302,19 +295,6 @@ if [ "$QMAKE" = "" ]; then exit 1 fi -# if not given, try to detect the qt major version to use -if [ "$HAVE_QT5" = "" ]; then - qt_major=`$QMAKE -v | grep 'Using Qt version' | sed 's/.*version *\([0-9][0-9]*\).*/\1/'` - if [ "$qt_major" = "4" ]; then - HAVE_QT5=0 - elif [ "$qt_major" = "5" ]; then - HAVE_QT5=1 - else - echo "*** ERROR: could not determine Qt version from '$QMAKE -v'" - exit 1 - fi -fi - echo "Using qmake: $QMAKE" echo "" @@ -492,11 +472,7 @@ if [ $HAVE_QT = 0 ]; then echo " Qt not used at all" fi if [ $HAVE_QTBINDINGS != 0 ]; then - if [ "$HAVE_QT5" != "0" ]; then - echo " Qt bindings enabled (Qt 5 API)" - else - echo " Qt bindings enabled (Qt 4 API)" - fi + echo " Qt bindings enabled" fi if [ $HAVE_64BIT_COORD != 0 ]; then echo " 64 bit coordinates enabled" @@ -613,13 +589,6 @@ echo "" echo "Running $QMAKE .." cd $BUILD -# chose the right qmake -if [ $HAVE_QT5 = 0 ]; then - export QT_SELECT=4 -else - export QT_SELECT=5 -fi - $QMAKE -v # Force a minimum rebuild because of version info @@ -647,7 +616,6 @@ qmake_options=( HAVE_QT_XML="$HAVE_QT_XML" HAVE_64BIT_COORD="$HAVE_64BIT_COORD" HAVE_QT="$HAVE_QT" - HAVE_QT5="$HAVE_QT5" HAVE_CURL="$HAVE_CURL" HAVE_EXPAT="$HAVE_EXPAT" PREFIX="$BIN" diff --git a/src/fontgen/fontgen.cc b/src/fontgen/fontgen.cc index b0569be29..ca0022d04 100644 --- a/src/fontgen/fontgen.cc +++ b/src/fontgen/fontgen.cc @@ -80,7 +80,7 @@ main (int argc, char *argv []) QFontMetrics fm (f); - int w = fm.width (QChar::fromLatin1 ('W')); + int w = fm.averageCharWidth (); printf ("\n// Font: %s\n", f.toString ().toLatin1 ().constData ()); printf ("const unsigned int ff%d_height = %d;\nconst unsigned int ff%d_line_height = %d;\nconst unsigned int ff%d_width = %d;\nconst unsigned int ff%d_stride = %d;\n", diff --git a/src/gsiqt/gsiqt.pro b/src/gsiqt/gsiqt.pro index a252b470f..c5ec9e487 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, "4") { SUBDIRS += qt5 qt5.depends += qtbasic } else { diff --git a/src/klayout.pri b/src/klayout.pri index 550c0cba7..bf5bde0a2 100644 --- a/src/klayout.pri +++ b/src/klayout.pri @@ -178,7 +178,7 @@ equals(HAVE_QT, "0") { } } - equals(HAVE_QT5, "1") { + greaterThan(QT_MAJOR, "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..299493d22 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, "4") { LIBS += -lklayout_QtWidgets diff --git a/src/lay/lay/lay.pro b/src/lay/lay/lay.pro index 8a07f7da3..965a938ea 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, "4") { LIBS += -lklayout_QtWidgets } } diff --git a/src/laybasic/laybasic/laybasic.pro b/src/laybasic/laybasic/laybasic.pro index 5cf65cefe..e42418b9f 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, "4") { LIBS += -lklayout_QtWidgets } } diff --git a/src/lib_ut.pri b/src/lib_ut.pri index 92abe0854..33c85999f 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, "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..113381a1b 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, "4") { SUBDIRS = lay_plugin unit_tests } diff --git a/src/pymod/QtCore/QtCore.pro b/src/pymod/QtCore/QtCore.pro index b45334bd4..2ede98c6c 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, "4") { LIBS += -lklayout_QtWidgets } diff --git a/src/pymod/QtGui/QtGui.pro b/src/pymod/QtGui/QtGui.pro index a2f39a5bc..913c80b58 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, "4") { LIBS += -lklayout_QtWidgets } diff --git a/src/pymod/QtXml/QtXml.pro b/src/pymod/QtXml/QtXml.pro index a8641948a..8b3faf3df 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, "4") { LIBS += -lklayout_QtWidgets } diff --git a/src/pymod/pymod.pro b/src/pymod/pymod.pro index 1b1998702..9b9b54900 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, "4") { SUBDIRS += QtWidgets diff --git a/src/pymod/tl/tl.pro b/src/pymod/tl/tl.pro index 2ae8a8b1f..5d1a65433 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, "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..741a387dc 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, "4") { LIBS += -lklayout_QtWidgets } }