luke/klayout
1
0
Fork 0
mirror of https://github.com/KLayout/klayout.git synced 2026-09-03 16:30:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Squashed commit of the following:

Browse Source 
commit 2a8a2d228d
Author: Matthias Koefferlein <[email protected]>
Date:   Fri Feb 26 23:54:08 2021 +0100

    One more fix.

commit 8c4d76505c
Author: Matthias Koefferlein <[email protected]>
Date:   Fri Feb 26 23:03:07 2021 +0100

    More patches for uitools-less build for CentOS 8

commit 2ac28292b8
Author: Matthias Koefferlein <[email protected]>
Date:   Fri Feb 26 22:52:27 2021 +0100

    First steps for fixing build on CentOS 8 without uitools
This commit is contained in:
Matthias Koefferlein
2021-02-26 23:59:23 +01:00
parent f993c0397d
commit 9350b33bcb
8 changed files with 44 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pymod/QtUiTools/QtUiTools.pro
+6 -1
View File
@@ -8,4 +8,9 @@ SOURCES = \
HEADERS += \
LIBS += -lklayout_QtUiTools -lklayout_QtCore
contains(QT_MODULES, uitools) {
LIBS += -lklayout_QtUiTools
}
LIBS += -lklayout_QtCore
src/pymod/QtUiTools/QtUiToolsMain.cc
+3 -1
View File
@@ -26,8 +26,10 @@
#include "../../gsiqt/qtbasic/gsiQtCoreExternals.h"
FORCE_LINK_GSI_QTCORE
#include "../../gsiqt/qtbasic/gsiQtUiToolsExternals.h"
#if defined(HAVE_QT_UITOOLS)
# include "../../gsiqt/qtbasic/gsiQtUiToolsExternals.h"
FORCE_LINK_GSI_QTUITOOLS
#endif
DEFINE_PYMOD(QtUiTools, "QtUiTools", "KLayout/Qt module 'QtUiTools'")
src/pymod/unit_tests/pymod_tests.cc
+5
View File
@@ -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")