diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-09-28 21:39:29 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-09-29 10:16:50 +0200 |
| commit | ac472b43a0ace04c03c939bc873efb8a18b4e1e3 (patch) | |
| tree | 75b60dcf94db83bfc51bec021b5568de686f596e | |
| parent | c662c744cf91f966dbc072afc6d433dbfed380fb (diff) | |
shiboken6: Fix some compiler warnings
- Add missing include to primitivetypeentry.h, making the header
self-sufficient. Amends 21e1bfafa1ed86adfa2e9ec4e990a582e4a20266.
- Remove unused function in codesnip.cpp
- Do not inject unused functions into qmenubar_wrapper.cpp
Pick-to: 6.3 6.2
Change-Id: Iaa077406c91f52ba47ce29534ee2b12bd8c23955
Reviewed-by: Christian Tismer <tismer@stackless.com>
| -rw-r--r-- | sources/pyside6/PySide6/QtWidgets/typesystem_widgets_common.xml | 1 | ||||
| -rw-r--r-- | sources/shiboken6/ApiExtractor/codesnip.cpp | 2 | ||||
| -rw-r--r-- | sources/shiboken6/ApiExtractor/primitivetypeentry.h | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/sources/pyside6/PySide6/QtWidgets/typesystem_widgets_common.xml b/sources/pyside6/PySide6/QtWidgets/typesystem_widgets_common.xml index 3d46c49d7..b06564bb8 100644 --- a/sources/pyside6/PySide6/QtWidgets/typesystem_widgets_common.xml +++ b/sources/pyside6/PySide6/QtWidgets/typesystem_widgets_common.xml @@ -870,7 +870,6 @@ </object-type> <object-type name="QMenuBar"> - <inject-code class="native" position="beginning" file="../glue/qtwidgets.cpp" snippet="qwidget-addaction-glue"/> <modify-function signature="addMenu(QMenu*)"> <modify-argument index="return"> <parent index="1" action="add"/> diff --git a/sources/shiboken6/ApiExtractor/codesnip.cpp b/sources/shiboken6/ApiExtractor/codesnip.cpp index 12e71fb70..e442a18a6 100644 --- a/sources/shiboken6/ApiExtractor/codesnip.cpp +++ b/sources/shiboken6/ApiExtractor/codesnip.cpp @@ -11,8 +11,6 @@ using namespace Qt::StringLiterals; -static inline QString callOperator() { return QStringLiteral("operator()"); } - QString TemplateInstance::expandCode() const { TemplateEntry *templateEntry = TypeDatabase::instance()->findTemplate(m_name); diff --git a/sources/shiboken6/ApiExtractor/primitivetypeentry.h b/sources/shiboken6/ApiExtractor/primitivetypeentry.h index e3e530f38..91a96f58d 100644 --- a/sources/shiboken6/ApiExtractor/primitivetypeentry.h +++ b/sources/shiboken6/ApiExtractor/primitivetypeentry.h @@ -5,6 +5,7 @@ #define PRIMITIVETYPEENTRY_H #include "typesystem.h" +#include "typesystem_typedefs.h" class PrimitiveTypeEntryPrivate; |