mirror of https://github.com/KLayout/klayout.git
WIP: avoid some warnings when using "import klayout.QtCore"
Reason: klayout_QtCore needs to be linked with QtGui so it's GSI declarations become available. The reason is only QSignalMapper which is in QtCore and has a QWidget argument.
This commit is contained in:
parent
403840b109
commit
1840e74d0d
|
|
@ -11,7 +11,7 @@ DEFINES += MAKE_GSI_QTCORE_LIBRARY
|
|||
INCLUDEPATH += $$TL_INC $$GSI_INC $$DB_INC $$QTBASIC_INC
|
||||
DEPENDPATH += $$TL_INC $$GSI_INC $$DB_INC $$QTBASIC_INC
|
||||
|
||||
LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_qtbasic
|
||||
LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_qtbasic -lklayout_QtGui
|
||||
|
||||
SOURCES += \
|
||||
gsiDeclQtCoreAdd.cc
|
||||
|
|
|
|||
|
|
@ -34,6 +34,11 @@
|
|||
// namespace which is in QtCore ... this introduces a dependency of QtCore GSI lib on QtGui.
|
||||
#include <QTextDocument>
|
||||
|
||||
// And this is *only* required because of QSignalMapper which takes a QWidget argument from
|
||||
// the QtGui library and we need to supply the GSI binding for this ...
|
||||
#include "gsiQtGuiExternals.h"
|
||||
FORCE_LINK_GSI_QTGUI
|
||||
|
||||
class Qt_Namespace { };
|
||||
|
||||
namespace gsi_qt
|
||||
|
|
@ -149,14 +154,6 @@ gsi::Class<QPair<double, QPointF> > decl_double_QPointF_QPair ("QtCore", "QPair_
|
|||
"@qt\\n@brief Represents a QPair<double, QPointF>"
|
||||
);
|
||||
|
||||
// ------------------------------------------------------------
|
||||
// Declarations for QPair<double, QColor>
|
||||
|
||||
gsi::Class<QPair<double, QColor> > decl_double_QColor_QPair ("QtCore", "QPair_double_QColor",
|
||||
qt_gsi::pair_decl<double, QColor>::methods (),
|
||||
"@qt\\n@brief Represents a QPair<double, QColor>"
|
||||
);
|
||||
|
||||
// ------------------------------------------------------------
|
||||
// Declarations for QPair<int, int>
|
||||
|
||||
|
|
|
|||
|
|
@ -29,6 +29,14 @@
|
|||
namespace gsi_qt
|
||||
{
|
||||
|
||||
// ------------------------------------------------------------
|
||||
// Declarations for QPair<double, QColor>
|
||||
|
||||
gsi::Class<QPair<double, QColor> > decl_double_QColor_QPair ("QtCore", "QPair_double_QColor",
|
||||
qt_gsi::pair_decl<double, QColor>::methods (),
|
||||
"@qt\\n@brief Represents a QPair<double, QColor>"
|
||||
);
|
||||
|
||||
// ------------------------------------------------------------
|
||||
// Declarations for QPair<QAccessibleInterface*, QAccessible::Relation>
|
||||
|
||||
|
|
|
|||
|
|
@ -150,14 +150,6 @@ gsi::Class<QPair<double, QPointF> > decl_double_QPointF_QPair ("QtCore", "QPair_
|
|||
"@qt\\n@brief Represents a QPair<double, QPointF>"
|
||||
);
|
||||
|
||||
// ------------------------------------------------------------
|
||||
// Declarations for QPair<double, QColor>
|
||||
|
||||
gsi::Class<QPair<double, QColor> > decl_double_QColor_QPair ("QtCore", "QPair_double_QColor",
|
||||
qt_gsi::pair_decl<double, QColor>::methods (),
|
||||
"@qt\\n@brief Represents a QPair<double, QColor>"
|
||||
);
|
||||
|
||||
// ------------------------------------------------------------
|
||||
// Declarations for QPair<int, int>
|
||||
|
||||
|
|
|
|||
|
|
@ -37,4 +37,12 @@ gsi::Class<QPair<QAccessibleInterface*, QAccessible::Relation> > decl_QAccessibl
|
|||
"@qt\\n@brief Represents a QPair<QAccessibleInterface*, QAccessible::Relation> >"
|
||||
);
|
||||
|
||||
// ------------------------------------------------------------
|
||||
// Declarations for QPair<double, QColor>
|
||||
|
||||
gsi::Class<QPair<double, QColor> > decl_double_QColor_QPair ("QtCore", "QPair_double_QColor",
|
||||
qt_gsi::pair_decl<double, QColor>::methods (),
|
||||
"@qt\\n@brief Represents a QPair<double, QColor>"
|
||||
);
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue