luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More patches for uitools-less build for CentOS 8

This commit is contained in:
Matthias Koefferlein 2021-02-26 23:03:07 +01:00
parent 2ac28292b8
commit 8c4d76505c
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gsiqt/qtbasic/gsiQtUiToolsExternals.h
View File

@ -20,7 +20,9 @@
*/
#if QT_VERSION >= 0x050000
#if !defined(HAVE_QT_UITOOLS)
# defined FORCE_LINK_GSI_QTUITOOLS
#elif QT_VERSION >= 0x050000
# include "../qt5/QtUiTools/gsiQtExternals.h"
#else
# include "../qt4/QtUiTools/gsiQtExternals.h"

5
src/klayout_main/klayout_main/klayout.cc
View File

@ -61,6 +61,7 @@
# include "gsiQtSvgExternals.h"
# include "gsiQtNetworkExternals.h"
# include "gsiQtDesignerExternals.h"
# include "gsiQtUiToolsExternals.h"
FORCE_LINK_GSI_QTCORE
FORCE_LINK_GSI_QTGUI
@ -73,11 +74,7 @@ FORCE_LINK_GSI_QTDESIGNER
FORCE_LINK_GSI_QTNETWORK
FORCE_LINK_GSI_QTSQL
FORCE_LINK_GSI_QTSVG
#if defined(HAVE_QT_UITOOLS)
# include "gsiQtUiToolsExternals.h"
FORCE_LINK_GSI_QTUITOOLS
#endif
#else
# define QT_EXTERNAL_BASE(x)

7
src/pymod/QtUiTools/QtUiTools.pro
View File

@ -8,8 +8,9 @@ SOURCES = \
HEADERS += \
LIBS += -lklayout_QtUiTools
contains(QT_MODULES, uitools) {
LIBS += -lklayout_QtCore
LIBS += -lklayout_QtUiTools
}
LIBS += -lklayout_QtCore

5
src/pymod/unit_tests/pymod_tests.cc
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")